Enclose isDeviceLostError and checkDeviceLost in their corresponding d3d9/d3d11 namespaces.
TRAC #22411
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Jamie Madill
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1854 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/renderer11_utils.h b/src/libGLESv2/renderer/renderer11_utils.h
index f087843..875b5e0 100644
--- a/src/libGLESv2/renderer/renderer11_utils.h
+++ b/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 @@
bool IsDepthStencilFormat(DXGI_FORMAT format);
HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name);
-}
inline bool isDeviceLostError(HRESULT errorCode)
{
@@ -86,3 +88,7 @@
return false;
}
}
+
+}
+
+#endif // LIBGLESV2_RENDERER_RENDERER11_UTILS_H