Rename renderer namespace to rx
Trac #21999
Author: Shannon Woods
Signed-off-by: Daniel Koch
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1379 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libEGL/Config.cpp b/src/libEGL/Config.cpp
index 042b42f..2e90b32 100644
--- a/src/libEGL/Config.cpp
+++ b/src/libEGL/Config.cpp
@@ -22,7 +22,7 @@
namespace egl
{
-Config::Config(renderer::ConfigDesc desc, EGLint minInterval, EGLint maxInterval, EGLint texWidth, EGLint texHeight)
+Config::Config(rx::ConfigDesc desc, EGLint minInterval, EGLint maxInterval, EGLint texWidth, EGLint texHeight)
: mRenderTargetFormat(desc.renderTargetFormat), mDepthStencilFormat(desc.depthStencilFormat), mMultiSample(desc.multiSample)
{
mBindToTextureRGB = EGL_FALSE;
@@ -222,7 +222,7 @@
{
}
-void ConfigSet::add(renderer::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight)
+void ConfigSet::add(rx::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight)
{
Config config(desc, minSwapInterval, maxSwapInterval, texWidth, texHeight);
mSet.insert(config);
diff --git a/src/libEGL/Config.h b/src/libEGL/Config.h
index b1c6167..680337b 100644
--- a/src/libEGL/Config.h
+++ b/src/libEGL/Config.h
@@ -26,7 +26,7 @@
class Config
{
public:
- Config(renderer::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight);
+ Config(rx::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight);
EGLConfig getHandle() const;
@@ -96,7 +96,7 @@
public:
ConfigSet();
- void add(renderer::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight);
+ void add(rx::ConfigDesc desc, EGLint minSwapInterval, EGLint maxSwapInterval, EGLint texWidth, EGLint texHeight);
size_t size() const;
bool getConfigs(EGLConfig *configs, const EGLint *attribList, EGLint configSize, EGLint *numConfig);
const egl::Config *get(EGLConfig configHandle);
diff --git a/src/libEGL/Display.cpp b/src/libEGL/Display.cpp
index 91f0b83..5fbeacf 100644
--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -98,7 +98,7 @@
EGLint maxTextureWidth = mRenderer->getMaxTextureWidth();
EGLint maxTextureHeight = mRenderer->getMaxTextureHeight();
- renderer::ConfigDesc *descList;
+ rx::ConfigDesc *descList;
int numConfigs = mRenderer->generateConfigs(&descList);
ConfigSet configSet;
diff --git a/src/libEGL/Display.h b/src/libEGL/Display.h
index 7dc8065..55254f4 100644
--- a/src/libEGL/Display.h
+++ b/src/libEGL/Display.h
@@ -54,8 +54,8 @@
bool isValidSurface(egl::Surface *surface);
bool hasExistingWindowSurface(HWND window);
- renderer::Renderer *getRenderer() { return mRenderer; };
- renderer::Renderer9 *getRenderer9() { assert(dynamic_cast<renderer::Renderer9*>(mRenderer) != NULL); return static_cast<renderer::Renderer9*>(mRenderer); }; // D3D9_REPLACE
+ rx::Renderer *getRenderer() { return mRenderer; };
+ rx::Renderer9 *getRenderer9() { assert(dynamic_cast<rx::Renderer9*>(mRenderer) != NULL); return static_cast<rx::Renderer9*>(mRenderer); }; // D3D9_REPLACE
virtual void notifyDeviceLost();
@@ -81,7 +81,7 @@
typedef std::set<gl::Context*> ContextSet;
ContextSet mContextSet;
- renderer::Renderer *mRenderer;
+ rx::Renderer *mRenderer;
void initExtensionString();
std::string mExtensionString;
diff --git a/src/libEGL/Surface.cpp b/src/libEGL/Surface.cpp
index c79b9a2..251632d 100644
--- a/src/libEGL/Surface.cpp
+++ b/src/libEGL/Surface.cpp
@@ -347,7 +347,7 @@
return mPostSubBufferSupported;
}
-renderer::SwapChain *Surface::getSwapChain() const
+rx::SwapChain *Surface::getSwapChain() const
{
return mSwapChain;
}
diff --git a/src/libEGL/Surface.h b/src/libEGL/Surface.h
index 625479a..5513cb0 100644
--- a/src/libEGL/Surface.h
+++ b/src/libEGL/Surface.h
@@ -20,7 +20,7 @@
{
class Texture2D;
}
-namespace renderer
+namespace rx
{
class Renderer9;
class SwapChain;
@@ -52,7 +52,7 @@
virtual EGLint isPostSubBufferSupported() const;
- virtual renderer::SwapChain *getSwapChain() const;
+ virtual rx::SwapChain *getSwapChain() const;
void setSwapInterval(EGLint interval);
bool checkForOutOfDateSwapChain(); // Returns true if swapchain changed due to resize or interval update
@@ -68,10 +68,10 @@
DISALLOW_COPY_AND_ASSIGN(Surface);
Display *const mDisplay;
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
HANDLE mShareHandle;
- renderer::SwapChain *mSwapChain;
+ rx::SwapChain *mSwapChain;
void subclassWindow();
void unsubclassWindow();
diff --git a/src/libEGL/libEGL.cpp b/src/libEGL/libEGL.cpp
index 27ba532..b8c7a8b 100644
--- a/src/libEGL/libEGL.cpp
+++ b/src/libEGL/libEGL.cpp
@@ -505,7 +505,7 @@
{
case EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE:
{
- renderer::SwapChain *swapchain = eglSurface->getSwapChain();
+ rx::SwapChain *swapchain = eglSurface->getSwapChain();
*value = (void*) (swapchain ? swapchain->getShareHandle() : NULL);
}
break;
@@ -886,7 +886,7 @@
return EGL_FALSE;
}
- renderer::Renderer *renderer = display->getRenderer();
+ rx::Renderer *renderer = display->getRenderer();
if (renderer->testDeviceLost(true))
{
return EGL_FALSE;
diff --git a/src/libGLESv2/Blit.cpp b/src/libGLESv2/Blit.cpp
index eaff32d..a3af087 100644
--- a/src/libGLESv2/Blit.cpp
+++ b/src/libGLESv2/Blit.cpp
@@ -44,7 +44,7 @@
namespace gl
{
-Blit::Blit(renderer::Renderer9 *renderer)
+Blit::Blit(rx::Renderer9 *renderer)
: mRenderer(renderer), mQuadVertexBuffer(NULL), mQuadVertexDeclaration(NULL), mSavedRenderTarget(NULL), mSavedDepthStencil(NULL), mSavedStateBlock(NULL)
{
initGeometry();
@@ -116,7 +116,7 @@
template <class D3DShaderType>
bool Blit::setShader(ShaderId source, const char *profile,
- D3DShaderType *(renderer::Renderer9::*createShader)(const DWORD *, size_t length),
+ D3DShaderType *(rx::Renderer9::*createShader)(const DWORD *, size_t length),
HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType*))
{
IDirect3DDevice9 *device = mRenderer->getDevice(); // D3D9_REPLACE
@@ -155,12 +155,12 @@
bool Blit::setVertexShader(ShaderId shader)
{
- return setShader<IDirect3DVertexShader9>(shader, "vs_2_0", &renderer::Renderer9::createVertexShader, &IDirect3DDevice9::SetVertexShader);
+ return setShader<IDirect3DVertexShader9>(shader, "vs_2_0", &rx::Renderer9::createVertexShader, &IDirect3DDevice9::SetVertexShader);
}
bool Blit::setPixelShader(ShaderId shader)
{
- return setShader<IDirect3DPixelShader9>(shader, "ps_2_0", &renderer::Renderer9::createPixelShader, &IDirect3DDevice9::SetPixelShader);
+ return setShader<IDirect3DPixelShader9>(shader, "ps_2_0", &rx::Renderer9::createPixelShader, &IDirect3DDevice9::SetPixelShader);
}
RECT Blit::getSurfaceRect(IDirect3DSurface9 *surface) const
diff --git a/src/libGLESv2/Blit.h b/src/libGLESv2/Blit.h
index 2c5a24f..fd4cc19 100644
--- a/src/libGLESv2/Blit.h
+++ b/src/libGLESv2/Blit.h
@@ -27,7 +27,7 @@
class Blit
{
public:
- explicit Blit(renderer::Renderer9 *renderer);
+ explicit Blit(rx::Renderer9 *renderer);
~Blit();
// Copy from source surface to dest surface.
@@ -45,7 +45,7 @@
bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);
private:
- renderer::Renderer9 *mRenderer;
+ rx::Renderer9 *mRenderer;
IDirect3DVertexBuffer9 *mQuadVertexBuffer;
IDirect3DVertexDeclaration9 *mQuadVertexDeclaration;
@@ -76,7 +76,7 @@
template <class D3DShaderType>
bool setShader(ShaderId source, const char *profile,
- D3DShaderType *(renderer::Renderer9::*createShader)(const DWORD *, size_t length),
+ D3DShaderType *(rx::Renderer9::*createShader)(const DWORD *, size_t length),
HRESULT (WINAPI IDirect3DDevice9::*setShader)(D3DShaderType*));
bool setVertexShader(ShaderId shader);
diff --git a/src/libGLESv2/Buffer.h b/src/libGLESv2/Buffer.h
index 41e62bc..9453d27 100644
--- a/src/libGLESv2/Buffer.h
+++ b/src/libGLESv2/Buffer.h
@@ -48,7 +48,7 @@
private:
DISALLOW_COPY_AND_ASSIGN(Buffer);
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
GLubyte *mContents;
GLsizeiptr mSize;
GLenum mUsage;
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 38a506c..30c10e4 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -318,7 +318,7 @@
}
// Wrap the existing swapchain resources into GL objects and assign them to the '0' names
- renderer::SwapChain *swapchain = surface->getSwapChain();
+ rx::SwapChain *swapchain = surface->getSwapChain();
Colorbuffer *colorbufferZero = new Colorbuffer(swapchain);
DepthStencilbuffer *depthStencilbufferZero = new DepthStencilbuffer(swapchain);
@@ -4398,23 +4398,23 @@
return gl::getContext();
}
-renderer::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice)
+rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice)
{
- return new renderer::Renderer9(display, hDc, softwareDevice); // D3D9_REPLACE
+ return new rx::Renderer9(display, hDc, softwareDevice); // D3D9_REPLACE
}
-void glDestroyRenderer(renderer::Renderer *renderer)
+void glDestroyRenderer(rx::Renderer *renderer)
{
delete renderer;
}
-renderer::SwapChain *glCreateSwapChain(renderer::Renderer9 *renderer, HWND window, HANDLE shareHandle,
+rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
GLenum backBufferFormat, GLenum depthBufferFormat)
{
- return new renderer::SwapChain(renderer, window, shareHandle, backBufferFormat, depthBufferFormat);
+ return new rx::SwapChain(renderer, window, shareHandle, backBufferFormat, depthBufferFormat);
}
-void glDestroySwapChain(renderer::SwapChain *swapChain)
+void glDestroySwapChain(rx::SwapChain *swapChain)
{
delete swapChain;
}
diff --git a/src/libGLESv2/Context.h b/src/libGLESv2/Context.h
index 41eece2..6dd7305 100644
--- a/src/libGLESv2/Context.h
+++ b/src/libGLESv2/Context.h
@@ -541,7 +541,7 @@
egl::Display *mDisplay;
IDirect3DDevice9 *mDevice;
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
State mState;
@@ -667,11 +667,11 @@
void glDestroyContext(gl::Context *context);
void glMakeCurrent(gl::Context *context, egl::Display *display, egl::Surface *surface);
gl::Context *glGetCurrentContext();
-renderer::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
-void glDestroyRenderer(renderer::Renderer *renderer);
-renderer::SwapChain *glCreateSwapChain(renderer::Renderer9 *renderer, HWND window, HANDLE shareHandle,
+rx::Renderer *glCreateRenderer(egl::Display *display, HDC hDc, bool softwareDevice);
+void glDestroyRenderer(rx::Renderer *renderer);
+rx::SwapChain *glCreateSwapChain(rx::Renderer9 *renderer, HWND window, HANDLE shareHandle,
GLenum backBufferFormat, GLenum depthBufferFormat); // D3D9_REPLACE
-void glDestroySwapChain(renderer::SwapChain *swapChain);
+void glDestroySwapChain(rx::SwapChain *swapChain);
__eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *procname);
bool __stdcall glBindTexImage(egl::Surface *surface);
diff --git a/src/libGLESv2/Fence.cpp b/src/libGLESv2/Fence.cpp
index ee89a11..1e4e8ec 100644
--- a/src/libGLESv2/Fence.cpp
+++ b/src/libGLESv2/Fence.cpp
@@ -13,7 +13,7 @@
namespace gl
{
-Fence::Fence(renderer::Renderer9 *renderer)
+Fence::Fence(rx::Renderer9 *renderer)
{
mRenderer = renderer;
mQuery = NULL;
diff --git a/src/libGLESv2/Fence.h b/src/libGLESv2/Fence.h
index 02a2c7c..0de3cc9 100644
--- a/src/libGLESv2/Fence.h
+++ b/src/libGLESv2/Fence.h
@@ -22,7 +22,7 @@
class Fence
{
public:
- explicit Fence(renderer::Renderer9 *renderer);
+ explicit Fence(rx::Renderer9 *renderer);
virtual ~Fence();
GLboolean isFence();
@@ -34,7 +34,7 @@
private:
DISALLOW_COPY_AND_ASSIGN(Fence);
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
IDirect3DQuery9* mQuery; // D3D9_REPLACE
GLenum mCondition;
GLboolean mStatus;
diff --git a/src/libGLESv2/IndexDataManager.cpp b/src/libGLESv2/IndexDataManager.cpp
index b75991c..fc8c20b 100644
--- a/src/libGLESv2/IndexDataManager.cpp
+++ b/src/libGLESv2/IndexDataManager.cpp
@@ -19,7 +19,7 @@
{
unsigned int IndexBuffer::mCurrentSerial = 1;
-IndexDataManager::IndexDataManager(renderer::Renderer9 *renderer) : mRenderer(renderer)
+IndexDataManager::IndexDataManager(rx::Renderer9 *renderer) : mRenderer(renderer)
{
mStreamingBufferShort = new StreamingIndexBuffer(mRenderer, INITIAL_INDEX_BUFFER_SIZE, D3DFMT_INDEX16);
@@ -281,7 +281,7 @@
return mCountingBuffer;
}
-IndexBuffer::IndexBuffer(renderer::Renderer9 *renderer, UINT size, D3DFORMAT format) : mRenderer(renderer), mBufferSize(size), mIndexBuffer(NULL)
+IndexBuffer::IndexBuffer(rx::Renderer9 *renderer, UINT size, D3DFORMAT format) : mRenderer(renderer), mBufferSize(size), mIndexBuffer(NULL)
{
if (size > 0)
{
@@ -327,7 +327,7 @@
}
}
-StreamingIndexBuffer::StreamingIndexBuffer(renderer::Renderer9 *renderer, UINT initialSize, D3DFORMAT format) : IndexBuffer(renderer, initialSize, format)
+StreamingIndexBuffer::StreamingIndexBuffer(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format) : IndexBuffer(renderer, initialSize, format)
{
mWritePosition = 0;
}
@@ -390,7 +390,7 @@
}
}
-StaticIndexBuffer::StaticIndexBuffer(renderer::Renderer9 *renderer) : IndexBuffer(renderer, 0, D3DFMT_UNKNOWN)
+StaticIndexBuffer::StaticIndexBuffer(rx::Renderer9 *renderer) : IndexBuffer(renderer, 0, D3DFMT_UNKNOWN)
{
mCacheType = GL_NONE;
}
diff --git a/src/libGLESv2/IndexDataManager.h b/src/libGLESv2/IndexDataManager.h
index 792d11d..ba021c5 100644
--- a/src/libGLESv2/IndexDataManager.h
+++ b/src/libGLESv2/IndexDataManager.h
@@ -39,7 +39,7 @@
class IndexBuffer
{
public:
- IndexBuffer(renderer::Renderer9 *renderer, UINT size, D3DFORMAT format);
+ IndexBuffer(rx::Renderer9 *renderer, UINT size, D3DFORMAT format);
virtual ~IndexBuffer();
UINT size() const { return mBufferSize; }
@@ -51,7 +51,7 @@
unsigned int getSerial() const;
protected:
- renderer::Renderer9 *const mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *const mRenderer; // D3D9_REPLACE
IDirect3DIndexBuffer9 *mIndexBuffer;
UINT mBufferSize;
@@ -67,7 +67,7 @@
class StreamingIndexBuffer : public IndexBuffer
{
public:
- StreamingIndexBuffer(renderer::Renderer9 *renderer, UINT initialSize, D3DFORMAT format);
+ StreamingIndexBuffer(rx::Renderer9 *renderer, UINT initialSize, D3DFORMAT format);
~StreamingIndexBuffer();
virtual void *map(UINT requiredSpace, UINT *offset);
@@ -80,7 +80,7 @@
class StaticIndexBuffer : public IndexBuffer
{
public:
- explicit StaticIndexBuffer(renderer::Renderer9 *renderer);
+ explicit StaticIndexBuffer(rx::Renderer9 *renderer);
~StaticIndexBuffer();
virtual void *map(UINT requiredSpace, UINT *offset);
@@ -125,7 +125,7 @@
class IndexDataManager
{
public:
- IndexDataManager(renderer::Renderer9 *renderer);
+ IndexDataManager(rx::Renderer9 *renderer);
virtual ~IndexDataManager();
GLenum prepareIndexData(GLenum type, GLsizei count, Buffer *arrayElementBuffer, const GLvoid *indices, TranslatedIndexData *translated);
@@ -137,7 +137,7 @@
std::size_t typeSize(GLenum type) const;
std::size_t indexSize(D3DFORMAT format) const;
- renderer::Renderer9 *const mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *const mRenderer; // D3D9_REPLACE
StreamingIndexBuffer *mStreamingBufferShort;
StreamingIndexBuffer *mStreamingBufferInt;
diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index b90bcea..02d3aa9 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -184,7 +184,7 @@
void applyUniformniv(Uniform *targetUniform, GLsizei count, const Vector4 *vector);
void applyUniformnbv(Uniform *targetUniform, GLsizei count, int width, const GLboolean *v);
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
IDirect3DDevice9 *mDevice; // D3D9_REPLACE
IDirect3DPixelShader9 *mPixelExecutable; // D3D9_REPLACE
diff --git a/src/libGLESv2/Query.cpp b/src/libGLESv2/Query.cpp
index 55fe9f4..c04327c 100644
--- a/src/libGLESv2/Query.cpp
+++ b/src/libGLESv2/Query.cpp
@@ -13,7 +13,7 @@
namespace gl
{
-Query::Query(renderer::Renderer9 *renderer, GLuint id, GLenum type) : RefCountObject(id)
+Query::Query(rx::Renderer9 *renderer, GLuint id, GLenum type) : RefCountObject(id)
{
mRenderer = renderer;
mQuery = NULL;
diff --git a/src/libGLESv2/Query.h b/src/libGLESv2/Query.h
index 52554e7..dea6455 100644
--- a/src/libGLESv2/Query.h
+++ b/src/libGLESv2/Query.h
@@ -23,7 +23,7 @@
class Query : public RefCountObject
{
public:
- Query(renderer::Renderer9 *renderer, GLuint id, GLenum type);
+ Query(rx::Renderer9 *renderer, GLuint id, GLenum type);
virtual ~Query();
void begin();
@@ -36,7 +36,7 @@
private:
DISALLOW_COPY_AND_ASSIGN(Query);
- renderer::Renderer9 *mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *mRenderer; // D3D9_REPLACE
GLboolean testQuery();
diff --git a/src/libGLESv2/Renderbuffer.cpp b/src/libGLESv2/Renderbuffer.cpp
index 5f923c8..dab245f 100644
--- a/src/libGLESv2/Renderbuffer.cpp
+++ b/src/libGLESv2/Renderbuffer.cpp
@@ -382,7 +382,7 @@
return firstSerial;
}
-Colorbuffer::Colorbuffer(renderer::SwapChain *swapChain)
+Colorbuffer::Colorbuffer(rx::SwapChain *swapChain)
{
mRenderTarget = swapChain->getRenderTarget();
if (mRenderTarget)
@@ -401,7 +401,7 @@
Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples) : mRenderTarget(NULL)
{
- renderer::Renderer9 *renderer = getDisplay()->getRenderer9();
+ rx::Renderer9 *renderer = getDisplay()->getRenderer9();
IDirect3DDevice9 *device = renderer->getDevice(); // D3D9_REPLACE
D3DFORMAT requestedFormat = es2dx::ConvertRenderbufferFormat(format);
@@ -457,7 +457,7 @@
return mRenderTarget;
}
-DepthStencilbuffer::DepthStencilbuffer(renderer::SwapChain *swapChain)
+DepthStencilbuffer::DepthStencilbuffer(rx::SwapChain *swapChain)
{
mDepthStencil = swapChain->getDepthStencil();
if (mDepthStencil)
@@ -476,7 +476,7 @@
DepthStencilbuffer::DepthStencilbuffer(int width, int height, GLsizei samples)
{
- renderer::Renderer9 *renderer = getDisplay()->getRenderer9();
+ rx::Renderer9 *renderer = getDisplay()->getRenderer9();
IDirect3DDevice9 *device = renderer->getDevice(); // D3D9_REPLACE
mDepthStencil = NULL;
diff --git a/src/libGLESv2/Renderbuffer.h b/src/libGLESv2/Renderbuffer.h
index 1043347..830b1d9 100644
--- a/src/libGLESv2/Renderbuffer.h
+++ b/src/libGLESv2/Renderbuffer.h
@@ -202,7 +202,7 @@
class Colorbuffer : public RenderbufferStorage
{
public:
- explicit Colorbuffer(renderer::SwapChain *swapChain);
+ explicit Colorbuffer(rx::SwapChain *swapChain);
Colorbuffer(GLsizei width, GLsizei height, GLenum format, GLsizei samples);
virtual ~Colorbuffer();
@@ -218,7 +218,7 @@
class DepthStencilbuffer : public RenderbufferStorage
{
public:
- explicit DepthStencilbuffer(renderer::SwapChain *swapChain);
+ explicit DepthStencilbuffer(rx::SwapChain *swapChain);
DepthStencilbuffer(GLsizei width, GLsizei height, GLsizei samples);
~DepthStencilbuffer();
diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 720136e..17bbba3 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -442,7 +442,7 @@
mImageArray[0].redefine(internalformat, surface->getWidth(), surface->getHeight(), true);
delete mTexStorage;
- renderer::SwapChain *swapchain = surface->getSwapChain(); // D3D9_REPLACE
+ rx::SwapChain *swapchain = surface->getSwapChain(); // D3D9_REPLACE
mTexStorage = new TextureStorage2D(swapchain);
mDirtyImages = true;
diff --git a/src/libGLESv2/VertexDataManager.cpp b/src/libGLESv2/VertexDataManager.cpp
index b0cdb87..44bd247 100644
--- a/src/libGLESv2/VertexDataManager.cpp
+++ b/src/libGLESv2/VertexDataManager.cpp
@@ -37,7 +37,7 @@
return (size - attribute.mOffset % stride + (stride - attribute.typeSize())) / stride;
}
-VertexDataManager::VertexDataManager(renderer::Renderer9 *renderer) : mRenderer(renderer)
+VertexDataManager::VertexDataManager(rx::Renderer9 *renderer) : mRenderer(renderer)
{
for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
{
@@ -569,7 +569,7 @@
}
}
-VertexBuffer::VertexBuffer(renderer::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : mRenderer(renderer), mVertexBuffer(NULL)
+VertexBuffer::VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : mRenderer(renderer), mVertexBuffer(NULL)
{
if (size > 0)
{
@@ -615,7 +615,7 @@
return mCurrentSerial++;
}
-ArrayVertexBuffer::ArrayVertexBuffer(renderer::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : VertexBuffer(renderer, size, usageFlags)
+ArrayVertexBuffer::ArrayVertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags) : VertexBuffer(renderer, size, usageFlags)
{
mBufferSize = size;
mWritePosition = 0;
@@ -631,7 +631,7 @@
mRequiredSpace += requiredSpace;
}
-StreamingVertexBuffer::StreamingVertexBuffer(renderer::Renderer9 *renderer, std::size_t initialSize) : ArrayVertexBuffer(renderer, initialSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY)
+StreamingVertexBuffer::StreamingVertexBuffer(rx::Renderer9 *renderer, std::size_t initialSize) : ArrayVertexBuffer(renderer, initialSize, D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY)
{
}
@@ -698,7 +698,7 @@
mRequiredSpace = 0;
}
-StaticVertexBuffer::StaticVertexBuffer(renderer::Renderer9 *renderer) : ArrayVertexBuffer(renderer, 0, D3DUSAGE_WRITEONLY)
+StaticVertexBuffer::StaticVertexBuffer(rx::Renderer9 *renderer) : ArrayVertexBuffer(renderer, 0, D3DUSAGE_WRITEONLY)
{
}
diff --git a/src/libGLESv2/VertexDataManager.h b/src/libGLESv2/VertexDataManager.h
index e60fd48..9faf69a 100644
--- a/src/libGLESv2/VertexDataManager.h
+++ b/src/libGLESv2/VertexDataManager.h
@@ -37,7 +37,7 @@
class VertexBuffer
{
public:
- VertexBuffer(renderer::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
+ VertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
virtual ~VertexBuffer();
void unmap();
@@ -46,7 +46,7 @@
unsigned int getSerial() const;
protected:
- renderer::Renderer9 *const mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *const mRenderer; // D3D9_REPLACE
IDirect3DVertexBuffer9 *mVertexBuffer;
unsigned int mSerial;
@@ -60,7 +60,7 @@
class ArrayVertexBuffer : public VertexBuffer
{
public:
- ArrayVertexBuffer(renderer::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
+ ArrayVertexBuffer(rx::Renderer9 *renderer, std::size_t size, DWORD usageFlags);
~ArrayVertexBuffer();
std::size_t size() const { return mBufferSize; }
@@ -77,7 +77,7 @@
class StreamingVertexBuffer : public ArrayVertexBuffer
{
public:
- StreamingVertexBuffer(renderer::Renderer9 *renderer, std::size_t initialSize);
+ StreamingVertexBuffer(rx::Renderer9 *renderer, std::size_t initialSize);
~StreamingVertexBuffer();
void *map(const VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset);
@@ -87,7 +87,7 @@
class StaticVertexBuffer : public ArrayVertexBuffer
{
public:
- explicit StaticVertexBuffer(renderer::Renderer9 *renderer);
+ explicit StaticVertexBuffer(rx::Renderer9 *renderer);
~StaticVertexBuffer();
void *map(const VertexAttribute &attribute, std::size_t requiredSpace, std::size_t *streamOffset);
@@ -113,7 +113,7 @@
class VertexDataManager
{
public:
- VertexDataManager(renderer::Renderer9 *renderer);
+ VertexDataManager(rx::Renderer9 *renderer);
virtual ~VertexDataManager();
void dirtyCurrentValue(int index) { mDirtyCurrentValue[index] = true; }
@@ -126,7 +126,7 @@
std::size_t spaceRequired(const VertexAttribute &attrib, std::size_t count, GLsizei instances) const;
std::size_t writeAttributeData(ArrayVertexBuffer *vertexBuffer, GLint start, GLsizei count, const VertexAttribute &attribute, GLsizei instances);
- renderer::Renderer9 *const mRenderer; // D3D9_REPLACE
+ rx::Renderer9 *const mRenderer; // D3D9_REPLACE
StreamingVertexBuffer *mStreamingBuffer;
diff --git a/src/libGLESv2/renderer/Renderer.h b/src/libGLESv2/renderer/Renderer.h
index 493c3ea..8f3c847 100644
--- a/src/libGLESv2/renderer/Renderer.h
+++ b/src/libGLESv2/renderer/Renderer.h
@@ -37,7 +37,7 @@
class Display;
}
-namespace renderer
+namespace rx
{
struct ConfigDesc
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index cda0256..c34befb 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -27,7 +27,7 @@
#define ANGLE_ENABLE_D3D9EX 1
#endif // !defined(ANGLE_ENABLE_D3D9EX)
-namespace renderer
+namespace rx
{
const D3DFORMAT Renderer9::mRenderTargetFormats[] =
{
diff --git a/src/libGLESv2/renderer/Renderer9.h b/src/libGLESv2/renderer/Renderer9.h
index 63d659a..ce262b2 100644
--- a/src/libGLESv2/renderer/Renderer9.h
+++ b/src/libGLESv2/renderer/Renderer9.h
@@ -26,7 +26,7 @@
#include "libGLESv2/renderer/ShaderCache.h"
#include "libGLESv2/renderer/Renderer.h"
-namespace renderer
+namespace rx
{
class Renderer9 : public Renderer
diff --git a/src/libGLESv2/renderer/ShaderCache.h b/src/libGLESv2/renderer/ShaderCache.h
index 4aad88f..93d7267 100644
--- a/src/libGLESv2/renderer/ShaderCache.h
+++ b/src/libGLESv2/renderer/ShaderCache.h
@@ -4,7 +4,7 @@
// found in the LICENSE file.
//
-// ShaderCache: Defines renderer::ShaderCache, a cache of Direct3D shader objects
+// ShaderCache: Defines rx::ShaderCache, a cache of Direct3D shader objects
// keyed by their byte code.
#ifndef LIBGLESV2_RENDERER_SHADER_CACHE_H_
@@ -20,7 +20,7 @@
#include "common/debug.h"
-namespace renderer
+namespace rx
{
template <typename ShaderObject>
class ShaderCache
diff --git a/src/libGLESv2/renderer/SwapChain.cpp b/src/libGLESv2/renderer/SwapChain.cpp
index c2f6136..8f1ed98 100644
--- a/src/libGLESv2/renderer/SwapChain.cpp
+++ b/src/libGLESv2/renderer/SwapChain.cpp
@@ -15,7 +15,7 @@
#include "libGLESv2/renderer/Renderer9.h" // D3D9_REPLACE
#include "libGLESv2/Context.h"
-namespace renderer
+namespace rx
{
SwapChain::SwapChain(Renderer9 *renderer, HWND window, HANDLE shareHandle,
diff --git a/src/libGLESv2/renderer/SwapChain.h b/src/libGLESv2/renderer/SwapChain.h
index e106ca2..acc4fbe 100644
--- a/src/libGLESv2/renderer/SwapChain.h
+++ b/src/libGLESv2/renderer/SwapChain.h
@@ -16,18 +16,18 @@
#define EGLAPI
#include <EGL/egl.h>
-#include <d3d9.h> // D3D9_REPLACE
+#include <d3d9.h> // D3D9_REPLACE
-#include "common/angleutils.h"
+#include "common/angleutils.h"
-namespace renderer
+namespace rx
{
-class Renderer9; // D3D9_REPLACE
+class Renderer9; // D3D9_REPLACE
class SwapChain
{
public:
- SwapChain(Renderer9 *renderer, HWND window, HANDLE shareHandle,
+ SwapChain(Renderer9 *renderer, HWND window, HANDLE shareHandle,
GLenum backBufferFormat, GLenum depthBufferFormat);
virtual ~SwapChain();
@@ -45,7 +45,7 @@
void release();
- Renderer9 *mRenderer; // D3D9_REPLACE
+ Renderer9 *mRenderer; // D3D9_REPLACE
EGLint mHeight;
EGLint mWidth;
diff --git a/src/libGLESv2/renderer/TextureStorage.cpp b/src/libGLESv2/renderer/TextureStorage.cpp
index 7b53fb0..3724afa 100644
--- a/src/libGLESv2/renderer/TextureStorage.cpp
+++ b/src/libGLESv2/renderer/TextureStorage.cpp
@@ -172,7 +172,7 @@
if (source && dest)
{
HRESULT result = D3DERR_OUTOFVIDEOMEMORY;
- renderer::Renderer9 *renderer = getDisplay()->getRenderer9();
+ rx::Renderer9 *renderer = getDisplay()->getRenderer9();
IDirect3DDevice9 *device = renderer->getDevice(); // D3D9_REPLACE
if (fromManaged)
@@ -206,7 +206,7 @@
return true;
}
-TextureStorage2D::TextureStorage2D(renderer::SwapChain *swapchain) : TextureStorage(D3DUSAGE_RENDERTARGET), mRenderTargetSerial(RenderbufferStorage::issueSerial())
+TextureStorage2D::TextureStorage2D(rx::SwapChain *swapchain) : TextureStorage(D3DUSAGE_RENDERTARGET), mRenderTargetSerial(RenderbufferStorage::issueSerial())
{
IDirect3DTexture9 *surfaceTexture = swapchain->getOffscreenTexture();
mTexture = surfaceTexture;
diff --git a/src/libGLESv2/renderer/TextureStorage.h b/src/libGLESv2/renderer/TextureStorage.h
index 2b0edae..f2a3205 100644
--- a/src/libGLESv2/renderer/TextureStorage.h
+++ b/src/libGLESv2/renderer/TextureStorage.h
@@ -17,7 +17,7 @@
#include "common/debug.h"
-namespace renderer
+namespace rx
{
class SwapChain;
}
@@ -68,7 +68,7 @@
class TextureStorage2D : public TextureStorage
{
public:
- explicit TextureStorage2D(renderer::SwapChain *swapchain);
+ explicit TextureStorage2D(rx::SwapChain *swapchain);
TextureStorage2D(int levels, GLenum internalformat, GLenum usage, bool forceRenderable, GLsizei width, GLsizei height);
virtual ~TextureStorage2D();