Texture storage now has deferred creation of all render targets and shader resources.

src/libGLESv2/renderer/TextureStorage.h

@@ -35,8 +35,8 @@ class TextureStorage
     virtual bool isManaged() const = 0;
     virtual int levelCount() = 0;
 
-    virtual RenderTarget *getRenderTarget() const = 0;
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget) const = 0;
+    virtual RenderTarget *getRenderTarget() = 0;
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget) = 0;
     virtual void generateMipmap(int level) = 0;
     virtual void generateMipmap(int face, int level) = 0;
 

src/libGLESv2/renderer/TextureStorage11.h

@@ -12,6 +12,7 @@
 
 #include <d3d11.h>
 
+#include "libGLESv2/Texture.h"
 #include "libGLESv2/renderer/TextureStorage.h"
 
 namespace rx
@@ -36,11 +37,12 @@ class TextureStorage11 : public TextureStorage
     UINT getBindFlags() const;
 
     virtual ID3D11Texture2D *getBaseTexture() const = 0;
-    virtual ID3D11ShaderResourceView *getSRV() const = 0;
-    virtual RenderTarget *getRenderTarget() const { return getRenderTarget(0); }
-    virtual RenderTarget *getRenderTarget(int level) const { return NULL; }
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget) const { return getRenderTarget(faceTarget, 0); }
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level) const { return NULL; }
+    virtual ID3D11ShaderResourceView *getSRV() = 0;
+    virtual RenderTarget *getRenderTarget() { return getRenderTarget(0); }
+    virtual RenderTarget *getRenderTarget(int level) { return NULL; }
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget) { return getRenderTarget(faceTarget, 0); }
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level) { return NULL; }
+
     virtual void generateMipmap(int level) {};
     virtual void generateMipmap(int face, int level) {};
 
@@ -49,7 +51,7 @@ class TextureStorage11 : public TextureStorage
     virtual bool isManaged() const;
     virtual int levelCount();
     UINT getSubresourceIndex(int level, int faceTarget);
-    
+
     bool updateSubresourceLevel(ID3D11Texture2D *texture, int level, int faceTarget, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
 
   protected:
@@ -72,20 +74,22 @@ class TextureStorage11_2D : public TextureStorage11
 
     static TextureStorage11_2D *makeTextureStorage11_2D(TextureStorage *storage);
 
-    virtual RenderTarget *getRenderTarget(int level) const;
     virtual ID3D11Texture2D *getBaseTexture() const;
-    virtual ID3D11ShaderResourceView *getSRV() const;
+    virtual ID3D11ShaderResourceView *getSRV();
+    virtual RenderTarget *getRenderTarget(int level);
+
     virtual void generateMipmap(int level);
 
   private:
     DISALLOW_COPY_AND_ASSIGN(TextureStorage11_2D);
 
-    void initializeRenderTarget(DXGI_FORMAT format, int width, int height);
-    void initializeSRV(DXGI_FORMAT format);
-
     ID3D11Texture2D *mTexture;
+    DXGI_FORMAT mTextureFormat;
+    unsigned int mTextureWidth;
+    unsigned int mTextureHeight;
+
     ID3D11ShaderResourceView *mSRV;
-    RenderTarget11 **mRenderTarget;
+    RenderTarget11 *mRenderTarget[gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
 };
 
 class TextureStorage11_Cube : public TextureStorage11
@@ -96,20 +100,22 @@ class TextureStorage11_Cube : public TextureStorage11
 
     static TextureStorage11_Cube *makeTextureStorage11_Cube(TextureStorage *storage);
 
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level) const;
     virtual ID3D11Texture2D *getBaseTexture() const;
-    virtual ID3D11ShaderResourceView *getSRV() const;
+    virtual ID3D11ShaderResourceView *getSRV();
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level);
+
     virtual void generateMipmap(int face, int level);
 
   private:
     DISALLOW_COPY_AND_ASSIGN(TextureStorage11_Cube);
 
-    void initializeRenderTarget(DXGI_FORMAT format, int size);
-    void initializeSRV(DXGI_FORMAT format);
-
     ID3D11Texture2D *mTexture;
+    DXGI_FORMAT mTextureFormat;
+    unsigned int mTextureWidth;
+    unsigned int mTextureHeight;
+
     ID3D11ShaderResourceView *mSRV;
-    RenderTarget11 **mRenderTarget[6];
+    RenderTarget11 *mRenderTarget[6][gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS];
 };
 
 }

src/libGLESv2/renderer/TextureStorage9.cpp

@@ -178,7 +178,7 @@ IDirect3DSurface9 *TextureStorage9_2D::getSurfaceLevel(int level, bool dirty)
     return surface;
 }
 
-RenderTarget *TextureStorage9_2D::getRenderTarget() const
+RenderTarget *TextureStorage9_2D::getRenderTarget()
 {
     return mRenderTarget;
 }
@@ -284,7 +284,7 @@ IDirect3DSurface9 *TextureStorage9_Cube::getCubeMapSurface(GLenum faceTarget, in
     return surface;
 }
 
-RenderTarget *TextureStorage9_Cube::getRenderTarget(GLenum faceTarget) const
+RenderTarget *TextureStorage9_Cube::getRenderTarget(GLenum faceTarget)
 {
     return mRenderTarget[gl::TextureCubeMap::faceIndex(faceTarget)];
 }

src/libGLESv2/renderer/TextureStorage9.h

@@ -41,8 +41,8 @@ class TextureStorage9 : public TextureStorage
     DWORD getUsage() const;
 
     virtual IDirect3DBaseTexture9 *getBaseTexture() const = 0;
-    virtual RenderTarget *getRenderTarget() const { return NULL; }
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget) const { return NULL; }
+    virtual RenderTarget *getRenderTarget() { return NULL; }
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget) { return NULL; }
     virtual void generateMipmap(int level) {};
     virtual void generateMipmap(int face, int level) {};
 
@@ -72,7 +72,7 @@ class TextureStorage9_2D : public TextureStorage9
     static TextureStorage9_2D *makeTextureStorage9_2D(TextureStorage *storage);
 
     IDirect3DSurface9 *getSurfaceLevel(int level, bool dirty);
-    virtual RenderTarget *getRenderTarget() const;
+    virtual RenderTarget *getRenderTarget();
     virtual IDirect3DBaseTexture9 *getBaseTexture() const;
     virtual void generateMipmap(int level);
 
@@ -94,7 +94,7 @@ class TextureStorage9_Cube : public TextureStorage9
     static TextureStorage9_Cube *makeTextureStorage9_Cube(TextureStorage *storage);
 
     IDirect3DSurface9 *getCubeMapSurface(GLenum faceTarget, int level, bool dirty);
-    virtual RenderTarget *getRenderTarget(GLenum faceTarget) const;
+    virtual RenderTarget *getRenderTarget(GLenum faceTarget);
     virtual IDirect3DBaseTexture9 *getBaseTexture() const;
     virtual void generateMipmap(int face, int level);