commit 34da397e13a101d6157619bfbd6c2f33efbd1a31
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:10:29 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Dec 20 21:10:29 2012 +0000
tree d8cf807acd3b30f970140610c934a86b5bc9c38e
parent 09929a2be9322fa5fe0fcf3f973d9d9e593107a4

Moves TextureStorage class to TextureStorage9, mostly.

TRAC #22300

Author: Shannon Woods
Signed-off-by: Geoff Lang
Signed-off-by: Daniel Koch

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

src/libGLESv2/renderer/Image9.cpp

diff --git a/src/libGLESv2/renderer/Image9.cpp b/src/libGLESv2/renderer/Image9.cpp
index b106659..e54e378 100644
--- a/src/libGLESv2/renderer/Image9.cpp
+++ b/src/libGLESv2/renderer/Image9.cpp
@@ -17,6 +17,7 @@
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/Framebuffer.h"
 #include "libGLESv2/renderer/RenderTarget9.h"
+#include "libGLESv2/renderer/TextureStorage9.h"
 
 #include "libGLESv2/renderer/renderer9_utils.h"
 #include "libGLESv2/renderer/generatemip.h"
@@ -239,7 +240,7 @@
 
 bool Image9::isRenderableFormat() const
 {    
-    return TextureStorage::IsTextureFormatRenderable(getD3DFormat());
+    return TextureStorage9::IsTextureFormatRenderable(getD3DFormat());
 }
 
 D3DFORMAT Image9::getD3DFormat() const
@@ -260,12 +261,14 @@
 
 void Image9::setManagedSurface(TextureStorage2D *storage, int level)
 {
-    setManagedSurface(storage->getSurfaceLevel(level, false));
+    TextureStorage2D9 *storage9 = TextureStorage2D9::makeTextureStorage2D9(storage->getStorageInterface());
+    setManagedSurface(storage9->getSurfaceLevel(level, false));
 }
 
 void Image9::setManagedSurface(TextureStorageCubeMap *storage, int face, int level)
 {
-    setManagedSurface(storage->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, false));
+    TextureStorageCubeMap9 *storage9 = TextureStorageCubeMap9::makeTextureStorageCubeMap9(storage->getStorageInterface());
+    setManagedSurface(storage9->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, false));
 }
 
 void Image9::setManagedSurface(IDirect3DSurface9 *surface)
@@ -290,13 +293,15 @@
 bool Image9::updateSurface(TextureStorage2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
     ASSERT(getSurface() != NULL);
-    return updateSurface(storage->getSurfaceLevel(level, true), xoffset, yoffset, width, height);
+    TextureStorage2D9 *storage9 = TextureStorage2D9::makeTextureStorage2D9(storage->getStorageInterface());
+    return updateSurface(storage9->getSurfaceLevel(level, true), xoffset, yoffset, width, height);
 }
 
 bool Image9::updateSurface(TextureStorageCubeMap *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
 {
     ASSERT(getSurface() != NULL);
-    return updateSurface(storage->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, true), xoffset, yoffset, width, height);
+    TextureStorageCubeMap9 *storage9 = TextureStorageCubeMap9::makeTextureStorageCubeMap9(storage->getStorageInterface());
+    return updateSurface(storage9->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, true), xoffset, yoffset, width, height);
 }
 
 bool Image9::updateSurface(IDirect3DSurface9 *destSurface, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)