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/Renderer9.cpp

diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 0254b84..44c8f56 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -576,7 +576,7 @@
 
     if (texture)
     {
-        gl::TextureStorage *texStorage = texture->getNativeTexture();
+        TextureStorage *texStorage = texture->getNativeTexture();
         if (texStorage)
         {
             d3dTexture = texStorage->getBaseTexture();
@@ -1059,7 +1059,7 @@
     return D3DFMT_A8R8G8B8;
 }
 
-bool Renderer9::copyToRenderTarget(gl::TextureStorage2D *dest, gl::TextureStorage2D *source)
+bool Renderer9::copyToRenderTarget(TextureStorage2D *dest, TextureStorage2D *source)
 {
     bool result = false;
 
@@ -1084,7 +1084,7 @@
     return result;
 }
 
-bool Renderer9::copyToRenderTarget(gl::TextureStorageCubeMap *dest, gl::TextureStorageCubeMap *source)
+bool Renderer9::copyToRenderTarget(TextureStorageCubeMap *dest, TextureStorageCubeMap *source)
 {
     bool result = false;
 
@@ -1130,13 +1130,13 @@
 }
 
 bool Renderer9::copyImage(gl::Framebuffer *framebuffer, const RECT &sourceRect, GLenum destFormat, GLint xoffset, GLint yoffset,
-                          gl::TextureStorage2D *storage, GLint level)
+                          TextureStorage2D *storage, GLint level)
 {
     return mBlit->copy(framebuffer, sourceRect, destFormat, xoffset, yoffset, storage, level);
 }
 
 bool Renderer9::copyImage(gl::Framebuffer *framebuffer, const RECT &sourceRect, GLenum destFormat, GLint xoffset, GLint yoffset,
-                          gl::TextureStorageCubeMap *storage, GLenum target, GLint level)
+                          TextureStorageCubeMap *storage, GLenum target, GLint level)
 {
     return mBlit->copy(framebuffer, sourceRect, destFormat, xoffset, yoffset, storage, target, level);
 }
@@ -1180,7 +1180,7 @@
 
             if (SUCCEEDED(result))
             {
-                gl::Image::CopyLockableSurfaces(surf, source);
+                Image::CopyLockableSurfaces(surf, source);
                 result = device->UpdateSurface(surf, NULL, dest, NULL);
                 surf->Release();
             }