Enclose isDeviceLostError and checkDeviceLost in their corresponding d3d9/d3d11 namespaces.

src/libGLESv2/renderer/Fence9.cpp

@@ -62,7 +62,7 @@ GLboolean Fence9::testFence()
 
     HRESULT result = mQuery->GetData(NULL, 0, D3DGETDATA_FLUSH);
 
-    if (checkDeviceLost(result))
+    if (d3d9::checkDeviceLost(result))
     {
        return error(GL_OUT_OF_MEMORY, GL_TRUE);
     }
@@ -107,7 +107,7 @@ void Fence9::getFenceiv(GLenum pname, GLint *params)
             
             HRESULT result = mQuery->GetData(NULL, 0, 0);
 
-            if (checkDeviceLost(result))
+            if (d3d9::checkDeviceLost(result))
             {
                 params[0] = GL_TRUE;
                 return error(GL_OUT_OF_MEMORY);

src/libGLESv2/renderer/Query9.cpp

@@ -108,7 +108,7 @@ GLboolean Query9::testQuery()
                 ASSERT(false);
             }
         }
-        else if (checkDeviceLost(hres))
+        else if (d3d9::checkDeviceLost(hres))
         {
             return error(GL_OUT_OF_MEMORY, GL_TRUE);
         }

src/libGLESv2/renderer/Renderer9.cpp

@@ -634,7 +634,7 @@ void Renderer9::sync(bool block)
 
     freeEventQuery(query);
 
-    if (isDeviceLostError(result))
+    if (d3d9::isDeviceLostError(result))
     {
         mDisplay->notifyDeviceLost();
     }
@@ -2705,7 +2705,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 (checkDeviceLost(result))
+        if (d3d9::checkDeviceLost(result))
             return error(GL_OUT_OF_MEMORY);
         else
         {

src/libGLESv2/renderer/SwapChain11.cpp

@@ -264,7 +264,7 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
             ERR("Could not create offscreen texture: %08lX", result);
             release();
 
-            if (isDeviceLostError(result))
+            if (d3d11::isDeviceLostError(result))
             {
                 return EGL_CONTEXT_LOST;
             }
@@ -348,7 +348,7 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
             ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result);
             release();
 
-            if (isDeviceLostError(result))
+            if (d3d11::isDeviceLostError(result))
             {
                 return EGL_CONTEXT_LOST;
             }
@@ -388,7 +388,7 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
             ERR("Could not create depthstencil surface for new swap chain: 0x%08X", result);
             release();
 
-            if (isDeviceLostError(result))
+            if (d3d11::isDeviceLostError(result))
             {
                 return EGL_CONTEXT_LOST;
             }

src/libGLESv2/renderer/SwapChain9.cpp

@@ -143,7 +143,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
         ERR("Could not create offscreen texture: %08lX", result);
         release();
 
-        if(isDeviceLostError(result))
+        if (d3d9::isDeviceLostError(result))
         {
             return EGL_CONTEXT_LOST;
         }
@@ -223,7 +223,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
             ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result);
             release();
 
-            if(isDeviceLostError(result))
+            if (d3d9::isDeviceLostError(result))
             {
                 return EGL_CONTEXT_LOST;
             }
@@ -251,7 +251,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
             ERR("Could not create depthstencil surface for new swap chain: 0x%08X", result);
             release();
 
-            if (isDeviceLostError(result))
+            if (d3d9::isDeviceLostError(result))
             {
                 return EGL_CONTEXT_LOST;
             }
@@ -339,7 +339,7 @@ EGLint SwapChain9::swapRect(EGLint x, EGLint y, EGLint width, EGLint height)
 
     mRenderer->markAllStateDirty();
 
-    if (isDeviceLostError(result))
+    if (d3d9::isDeviceLostError(result))
     {
         return EGL_CONTEXT_LOST;
     }

src/libGLESv2/renderer/renderer11_utils.h

@@ -7,6 +7,9 @@
 // renderer11_utils.h: Conversion functions and other utility routines
 // specific to the D3D11 renderer.
 
+#ifndef LIBGLESV2_RENDERER_RENDERER11_UTILS_H
+#define LIBGLESV2_RENDERER_RENDERER11_UTILS_H
+
 #define GL_APICALL
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ -70,7 +73,6 @@ size_t ComputeBlockSizeBits(DXGI_FORMAT format);
 
 bool IsDepthStencilFormat(DXGI_FORMAT format);
 HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name);
-}
 
 inline bool isDeviceLostError(HRESULT errorCode)
 {
@@ -86,3 +88,7 @@ inline bool isDeviceLostError(HRESULT errorCode)
         return false;
     }
 }
+
+}
+
+#endif // LIBGLESV2_RENDERER_RENDERER11_UTILS_H

src/libGLESv2/renderer/renderer9_utils.h

@@ -60,7 +60,6 @@ namespace d3d9
 {
 bool IsCompressedFormat(D3DFORMAT format);
 size_t ComputeRowSize(D3DFORMAT format, unsigned int width);
-}
 
 inline bool isDeviceLostError(HRESULT errorCode)
 {
@@ -89,4 +88,6 @@ inline bool checkDeviceLost(HRESULT errorCode)
     return false;
 };
 
+}
+
 #endif // LIBGLESV2_RENDERER_RENDERER9_UTILS_H