1 files changed, 7 insertions, 28 deletions

diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h
index 928a4dd3..eaa4cf7b 100644
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -51,7 +51,7 @@ class Texture : public RefCountObject
     SamplerState &getSamplerState() { return mSamplerState; }
     void getSamplerStateWithNativeOffset(SamplerState *sampler);
 
-    virtual void setUsage(GLenum usage);
+    void setUsage(GLenum usage);
     GLenum getUsage() const;
 
     GLint getBaseLevelWidth() const;
@@ -63,7 +63,7 @@ class Texture : public RefCountObject
 
     rx::TextureStorageInterface *getNativeTexture();
 
-    virtual void generateMipmaps() = 0;
+    virtual void generateMipmaps();
     virtual void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, Framebuffer *source);
 
     unsigned int getTextureSerial();
@@ -89,7 +89,7 @@ class Texture : public RefCountObject
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture);
 
-    virtual const rx::Image *getBaseLevelImage() const = 0;
+    const rx::Image *getBaseLevelImage() const;
 };
 
 class Texture2D : public Texture
@@ -99,8 +99,6 @@ class Texture2D : public Texture
 
     ~Texture2D();
 
-    virtual void setUsage(GLenum usage);
-
     GLsizei getWidth(GLint level) const;
     GLsizei getHeight(GLint level) const;
     GLenum getInternalFormat(GLint level) const;
@@ -128,15 +126,11 @@ class Texture2D : public Texture
   protected:
     friend class Texture2DAttachment;
     rx::RenderTarget *getRenderTarget(GLint level);
-    rx::RenderTarget *getDepthSencil(GLint level);
+    rx::RenderTarget *getDepthStencil(GLint level);
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture2D);
 
-    virtual const rx::Image *getBaseLevelImage() const;
-
-    void redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height);
-
     rx::Texture2DImpl *mTexture;
     egl::Surface *mSurface;
 };
@@ -148,8 +142,6 @@ class TextureCubeMap : public Texture
 
     ~TextureCubeMap();
 
-    virtual void setUsage(GLenum usage);
-
     GLsizei getWidth(GLenum target, GLint level) const;
     GLsizei getHeight(GLenum target, GLint level) const;
     GLenum getInternalFormat(GLenum target, GLint level) const;
@@ -173,10 +165,11 @@ class TextureCubeMap : public Texture
 
     bool isCubeComplete() const;
 
-    virtual void generateMipmaps();
-
     unsigned int getRenderTargetSerial(GLenum target, GLint level);
 
+    static int targetToLayerIndex(GLenum target);
+    static GLenum layerIndexToTarget(GLint layer);
+
     virtual rx::TextureImpl *getImplementation() { return mTexture; }
     virtual const rx::TextureImpl *getImplementation() const { return mTexture; }
 
@@ -188,8 +181,6 @@ class TextureCubeMap : public Texture
   private:
     DISALLOW_COPY_AND_ASSIGN(TextureCubeMap);
 
-    virtual const rx::Image *getBaseLevelImage() const;
-
     rx::TextureCubeImpl *mTexture;
 };
 
@@ -200,8 +191,6 @@ class Texture3D : public Texture
 
     ~Texture3D();
 
-    virtual void setUsage(GLenum usage);
-
     GLsizei getWidth(GLint level) const;
     GLsizei getHeight(GLint level) const;
     GLsizei getDepth(GLint level) const;
@@ -216,8 +205,6 @@ class Texture3D : public Texture
     void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels);
     void storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
 
-    virtual void generateMipmaps();
-
     unsigned int getRenderTargetSerial(GLint level, GLint layer);
 
     virtual rx::TextureImpl *getImplementation() { return mTexture; }
@@ -231,8 +218,6 @@ class Texture3D : public Texture
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture3D);
 
-    virtual const rx::Image *getBaseLevelImage() const;
-
     rx::Texture3DImpl *mTexture;
 };
 
@@ -243,8 +228,6 @@ class Texture2DArray : public Texture
 
     ~Texture2DArray();
 
-    virtual void setUsage(GLenum usage);
-
     GLsizei getWidth(GLint level) const;
     GLsizei getHeight(GLint level) const;
     GLsizei getLayers(GLint level) const;
@@ -259,8 +242,6 @@ class Texture2DArray : public Texture
     void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels);
     void storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
 
-    virtual void generateMipmaps();
-
     unsigned int getRenderTargetSerial(GLint level, GLint layer);
 
     virtual rx::TextureImpl *getImplementation() { return mTexture; }
@@ -274,8 +255,6 @@ class Texture2DArray : public Texture
   private:
     DISALLOW_COPY_AND_ASSIGN(Texture2DArray);
 
-    virtual const rx::Image *getBaseLevelImage() const;
-
     rx::Texture2DArrayImpl *mTexture;
 };