Put the renderer*_utils functions into the rx namespace.

TRAC #22972 Signed-off-by: Jamie Madill Signed-off-by: Nicolas Capens Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2315 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 4ad58e08
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include "common/debug.h" #include "common/debug.h"
namespace rx
{
namespace gl_d3d11 namespace gl_d3d11
{ {
...@@ -713,3 +716,5 @@ HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name) ...@@ -713,3 +716,5 @@ HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name)
} }
} }
}
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include "libGLESv2/angletypes.h" #include "libGLESv2/angletypes.h"
namespace rx
{
namespace gl_d3d11 namespace gl_d3d11
{ {
...@@ -120,4 +123,6 @@ inline bool isDeviceLostError(HRESULT errorCode) ...@@ -120,4 +123,6 @@ inline bool isDeviceLostError(HRESULT errorCode)
} }
}
#endif // LIBGLESV2_RENDERER_RENDERER11_UTILS_H #endif // LIBGLESV2_RENDERER_RENDERER11_UTILS_H
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
#include "common/debug.h" #include "common/debug.h"
namespace rx
{
namespace gl_d3d9 namespace gl_d3d9
{ {
...@@ -498,3 +501,5 @@ size_t ComputeRowSize(D3DFORMAT format, unsigned int width) ...@@ -498,3 +501,5 @@ size_t ComputeRowSize(D3DFORMAT format, unsigned int width)
} }
} }
}
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
#include "libGLESv2/utilities.h" #include "libGLESv2/utilities.h"
namespace rx
{
const D3DFORMAT D3DFMT_INTZ = ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z'))); const D3DFORMAT D3DFMT_INTZ = ((D3DFORMAT)(MAKEFOURCC('I','N','T','Z')));
const D3DFORMAT D3DFMT_NULL = ((D3DFORMAT)(MAKEFOURCC('N','U','L','L'))); const D3DFORMAT D3DFMT_NULL = ((D3DFORMAT)(MAKEFOURCC('N','U','L','L')));
...@@ -71,4 +74,6 @@ inline bool isDeviceLostError(HRESULT errorCode) ...@@ -71,4 +74,6 @@ inline bool isDeviceLostError(HRESULT errorCode)
} }
}
#endif // LIBGLESV2_RENDERER_RENDERER9_UTILS_H #endif // LIBGLESV2_RENDERER_RENDERER9_UTILS_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment