commit 31b13e1ff922519d727c151e7ee3eb93d453e5ea
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:34:30 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 19:34:30 2012 +0000
tree 8fcbaabf614f5cb81bce36a4261f5fd7bb88b276
parent de8a7fff02ab478458e4f511719e15f141c90fe7

Moves Image & Renderer into rx namespace

TRAC #22002

Signed-off-by: Daniel Koch

Author:    Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1414 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/TextureStorage.cpp

diff --git a/src/libGLESv2/renderer/TextureStorage.cpp b/src/libGLESv2/renderer/TextureStorage.cpp
index 0743db4..acb5488 100644
--- a/src/libGLESv2/renderer/TextureStorage.cpp
+++ b/src/libGLESv2/renderer/TextureStorage.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 
-// TextureStorage.cpp: Implements the abstract gl::TextureStorage class and its concrete derived
+// TextureStorage.cpp: Implements the abstract rx::TextureStorage class and its concrete derived
 // classes TextureStorage2D and TextureStorageCubeMap, which act as the interface to the
 // D3D-side texture.
 
@@ -17,11 +17,11 @@
 
 #include "common/debug.h"
 
-namespace gl
+namespace rx
 {
 unsigned int TextureStorage::mCurrentTextureSerial = 1;
 
-TextureStorage::TextureStorage(rx::Renderer9 *renderer, DWORD usage)
+TextureStorage::TextureStorage(Renderer9 *renderer, DWORD usage)
     : mD3DUsage(usage),
       mD3DPool(renderer->getTexturePool(usage)),
       mRenderer(renderer),
@@ -115,15 +115,15 @@
     return getBaseTexture() ? getBaseTexture()->GetLevelCount() - getLodOffset() : 0;
 }
 
-TextureStorage2D::TextureStorage2D(rx::Renderer9 *renderer, rx::SwapChain *swapchain) : TextureStorage(renderer, D3DUSAGE_RENDERTARGET), mRenderTargetSerial(RenderbufferStorage::issueSerial())
+TextureStorage2D::TextureStorage2D(Renderer9 *renderer, rx::SwapChain *swapchain) : TextureStorage(renderer, D3DUSAGE_RENDERTARGET), mRenderTargetSerial(gl::RenderbufferStorage::issueSerial())
 {
     IDirect3DTexture9 *surfaceTexture = swapchain->getOffscreenTexture();
     mTexture = surfaceTexture;
 }
 
-TextureStorage2D::TextureStorage2D(rx::Renderer9 *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, GLsizei width, GLsizei height)
+TextureStorage2D::TextureStorage2D(Renderer9 *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, GLsizei width, GLsizei height)
     : TextureStorage(renderer, GetTextureUsage(renderer->ConvertTextureInternalFormat(internalformat), usage, forceRenderable)),
-      mRenderTargetSerial(RenderbufferStorage::issueSerial())
+      mRenderTargetSerial(gl::RenderbufferStorage::issueSerial())
 {
     mTexture = NULL;
     // if the width or height is not positive this should be treated as an incomplete texture
@@ -131,7 +131,7 @@
     if (width > 0 && height > 0)
     {
         IDirect3DDevice9 *device = renderer->getDevice(); // D3D9_REPLACE
-        MakeValidSize(false, gl::IsCompressed(internalformat), &width, &height, &mLodOffset);
+        gl::MakeValidSize(false, gl::IsCompressed(internalformat), &width, &height, &mLodOffset);
         HRESULT result = device->CreateTexture(width, height, levels ? levels + mLodOffset : 0, getUsage(),
                                                renderer->ConvertTextureInternalFormat(internalformat), getPool(), &mTexture, NULL);
 
@@ -196,9 +196,9 @@
     return mRenderTargetSerial;
 }
 
-TextureStorageCubeMap::TextureStorageCubeMap(rx::Renderer9 *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, int size)
+TextureStorageCubeMap::TextureStorageCubeMap(Renderer9 *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, int size)
     : TextureStorage(renderer, GetTextureUsage(renderer->ConvertTextureInternalFormat(internalformat), usage, forceRenderable)),
-      mFirstRenderTargetSerial(RenderbufferStorage::issueCubeSerials())
+      mFirstRenderTargetSerial(gl::RenderbufferStorage::issueCubeSerials())
 {
     mTexture = NULL;
     // if the size is not positive this should be treated as an incomplete texture
@@ -207,7 +207,7 @@
     {
         IDirect3DDevice9 *device = renderer->getDevice();
         int height = size;
-        MakeValidSize(false, gl::IsCompressed(internalformat), &size, &height, &mLodOffset);
+        gl::MakeValidSize(false, gl::IsCompressed(internalformat), &size, &height, &mLodOffset);
         HRESULT result = device->CreateCubeTexture(size, levels ? levels + mLodOffset : 0, getUsage(),
                                                    renderer->ConvertTextureInternalFormat(internalformat), getPool(), &mTexture, NULL);
 
@@ -270,7 +270,7 @@
 
 unsigned int TextureStorageCubeMap::getRenderTargetSerial(GLenum target) const
 {
-    return mFirstRenderTargetSerial + TextureCubeMap::faceIndex(target);
+    return mFirstRenderTargetSerial + gl::TextureCubeMap::faceIndex(target);
 }
 
 }
\ No newline at end of file