Moves checkDeviceLost to renderer9_utils.h

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

@@ -8,7 +8,7 @@
 
 #include "libGLESv2/Query.h"
 
-#include "libGLESv2/main.h"
+#include "libGLESv2/renderer/renderer9_utils.h"
 
 namespace gl
 {

src/libGLESv2/main.cpp

@@ -121,18 +121,6 @@ egl::Display *getDisplay()
     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

@@ -32,7 +32,6 @@ Context *getContext();
 Context *getNonLostContext();
 egl::Display *getDisplay();
 
-bool checkDeviceLost(HRESULT errorCode);
 }
 
 void error(GLenum errorCode);

src/libGLESv2/renderer/Renderer9.cpp

@@ -1890,7 +1890,7 @@ void Renderer9::readPixels(gl::Framebuffer *framebuffer, GLint x, GLint y, GLsiz
 
         // 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

@@ -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 isDeviceLostError(HRESULT errorCode)
     }
 }
 
+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