commit 414c9168bc0491546d5af5cc775871b60a3c0153
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:54:57 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:54:57 2012 +0000
tree 156d65f223e10a9226bb3e99614a847a9a63cc75
parent 5fbf177ce23fc52625e1d7a6914fd7a9ce12c311

Moves checkDeviceLost to renderer9_utils.h

TRAC #22141

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1483 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Fence.cpp

diff --git a/src/libGLESv2/Fence.cpp b/src/libGLESv2/Fence.cpp
index 1e4e8ec..f6650cd 100644
--- a/src/libGLESv2/Fence.cpp
+++ b/src/libGLESv2/Fence.cpp
@@ -8,7 +8,7 @@
 
 #include "libGLESv2/Fence.h"
 
-#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/renderer9_utils.h"
 
 namespace gl
 {

src/libGLESv2/Query.cpp

diff --git a/src/libGLESv2/Query.cpp b/src/libGLESv2/Query.cpp
index c04327c..3a78c0d 100644
--- a/src/libGLESv2/Query.cpp
+++ b/src/libGLESv2/Query.cpp
@@ -8,7 +8,7 @@
 
 #include "libGLESv2/Query.h"
 
-#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/renderer9_utils.h"
 
 namespace gl
 {

src/libGLESv2/main.cpp

diff --git a/src/libGLESv2/main.cpp b/src/libGLESv2/main.cpp
index bda771a..6525615 100644
--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -121,18 +121,6 @@
     return current->display;
 }
 
-bool checkDeviceLost(HRESULT errorCode)
-{
-    egl::Display *display = NULL;
-
-    if (isDeviceLostError(errorCode))
-    {
-        display = gl::getDisplay();
-        display->notifyDeviceLost();
-        return true;
-    }
-    return false;
-}
 }
 
 // Records an error code

src/libGLESv2/main.h

diff --git a/src/libGLESv2/main.h b/src/libGLESv2/main.h
index 92440c8..e3e40ba 100644
--- a/src/libGLESv2/main.h
+++ b/src/libGLESv2/main.h
@@ -32,7 +32,6 @@
 Context *getNonLostContext();
 egl::Display *getDisplay();
 
-bool checkDeviceLost(HRESULT errorCode);
 }
 
 void error(GLenum errorCode);

src/libGLESv2/renderer/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 749b361..bdf6af9 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -1890,7 +1890,7 @@
 
         // It turns out that D3D will sometimes produce more error
         // codes than those documented.
-        if (gl::checkDeviceLost(result))
+        if (checkDeviceLost(result))
             return error(GL_OUT_OF_MEMORY);
         else
         {

src/libGLESv2/renderer/renderer9_utils.h

diff --git a/src/libGLESv2/renderer/renderer9_utils.h b/src/libGLESv2/renderer/renderer9_utils.h
index 1cbce3f..957ae63 100644
--- a/src/libGLESv2/renderer/renderer9_utils.h
+++ b/src/libGLESv2/renderer/renderer9_utils.h
@@ -16,6 +16,7 @@
 #include <d3d9.h>
 
 #include "libGLESv2/utilities.h"
+#include "libGLESv2/main.h"
 
 const D3DFORMAT D3DFMT_INTZ = ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z')));
 const D3DFORMAT D3DFMT_NULL = ((D3DFORMAT)(MAKEFOURCC('N','U','L','L')));
@@ -77,4 +78,17 @@
     }
 }
 
+inline bool checkDeviceLost(HRESULT errorCode)
+{
+    egl::Display *display = NULL;
+
+    if (isDeviceLostError(errorCode))
+    {
+        display = gl::getDisplay();
+        display->notifyDeviceLost();
+        return true;
+    }
+    return false;
+};
+
 #endif // LIBGLESV2_RENDERER_RENDERER9_UTILS_H