Unifying the various texture interfaces where possible

src/libGLESv2/FramebufferAttachment.cpp

@@ -95,7 +95,7 @@ rx::RenderTarget *Texture2DAttachment::getRenderTarget()
 
 rx::RenderTarget *Texture2DAttachment::getDepthStencil()
 {
-    return mTexture2D->getDepthSencil(mLevel);
+    return mTexture2D->getDepthStencil(mLevel);
 }
 
 rx::TextureStorage *Texture2DAttachment::getTextureStorage()

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;
 };
 

src/libGLESv2/renderer/TextureImpl.h

@@ -39,13 +39,28 @@ class TextureImpl
     // higher level code should not rely on it.
     virtual TextureStorageInterface *getNativeTexture() = 0;
 
+    virtual Image *getImage(int level, int layer) const = 0;
+    virtual GLsizei getLayerCount(int level) const = 0;
+
+    virtual bool hasDirtyImages() const = 0;
+    virtual void resetDirty() = 0;
     virtual void setUsage(GLenum usage) = 0;
 
     virtual bool isSamplerComplete(const gl::SamplerState &samplerState) const = 0;
 
+    virtual void setImage(GLenum target, GLint level, GLsizei width, GLsizei height, GLsizei depth, GLenum internalFormat, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
+    virtual void setCompressedImage(GLenum target, GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei depth, GLsizei imageSize, const void *pixels) = 0;
+    virtual void subImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
+    virtual void subImageCompressed(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels) = 0;
+    virtual void copyImage(GLenum target, GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, gl::Framebuffer *source) = 0;
     virtual void copySubImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height, gl::Framebuffer *source) = 0;
+    virtual void storage(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) = 0;
 
     virtual void generateMipmaps() = 0;
+
+    virtual unsigned int getRenderTargetSerial(GLint level, GLint layer) = 0;
+    virtual RenderTarget *getRenderTarget(GLint level, GLint layer) = 0;
+    virtual RenderTarget *getDepthStencil(GLint level, GLint layer) = 0;
 };
 
 class Texture2DImpl : public TextureImpl
@@ -53,24 +68,8 @@ class Texture2DImpl : public TextureImpl
   public:
     virtual ~Texture2DImpl() {}
 
-    virtual Image *getImage(int level) const = 0;
-
     virtual void bindTexImage(egl::Surface *surface) = 0;
     virtual void releaseTexImage() = 0;
-
-    virtual void setImage(GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei imageSize, const void *pixels) = 0;
-    virtual void subImage(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels) = 0;
-    virtual void copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, gl::Framebuffer *source) = 0;
-    virtual void storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) = 0;
-
-    virtual unsigned int getRenderTargetSerial(GLint level) = 0;
-
-    virtual RenderTarget *getRenderTarget(GLint level) = 0;
-    virtual RenderTarget *getDepthSencil(GLint level) = 0;
-
-    virtual void redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height) = 0;
 };
 
 class TextureCubeImpl : public TextureImpl
@@ -78,60 +77,19 @@ class TextureCubeImpl : public TextureImpl
   public:
     virtual ~TextureCubeImpl() {}
 
-    virtual Image *getImage(GLenum target, int level) const = 0;
-
     virtual bool isCubeComplete() const = 0;
-
-    virtual void setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void setCompressedImage(GLenum target, GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei imageSize, const void *pixels) = 0;
-    virtual void subImage(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void subImageCompressed(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *pixels) = 0;
-    virtual void copyImage(GLenum target, GLint level, GLenum format, GLint x, GLint y, GLsizei width, GLsizei height, gl::Framebuffer *source) = 0;
-    virtual void storage(GLsizei levels, GLenum internalformat, GLsizei size) = 0;
-
-    virtual unsigned int getRenderTargetSerial(GLenum target, GLint level) = 0;
-
-    virtual RenderTarget *getRenderTarget(GLenum target, GLint level) = 0;
-    virtual RenderTarget *getDepthStencil(GLenum target, GLint level) = 0;
 };
 
 class Texture3DImpl : public TextureImpl
 {
   public:
     virtual ~Texture3DImpl() {}
-
-    virtual Image *getImage(int level) const = 0;
-
-    virtual void setImage(GLint level, GLsizei width, GLsizei height, GLsizei depth, GLenum internalFormat, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei depth, GLsizei imageSize, const void *pixels) = 0;
-    virtual void subImage(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels) = 0;
-    virtual void storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) = 0;
-
-    virtual unsigned int getRenderTargetSerial(GLint level, GLint layer) = 0;
-
-    virtual RenderTarget *getRenderTarget(GLint level, GLint layer) = 0;
-    virtual RenderTarget *getDepthStencil(GLint level, GLint layer) = 0;
 };
 
 class Texture2DArrayImpl : public TextureImpl
 {
   public:
     virtual ~Texture2DArrayImpl() {}
-
-    virtual Image *getImage(int level, int layer) const = 0;
-    virtual GLsizei getLayerCount(int level) const = 0;
-
-    virtual void setImage(GLint level, GLsizei width, GLsizei height, GLsizei depth, GLenum internalFormat, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void setCompressedImage(GLint level, GLenum format, GLsizei width, GLsizei height, GLsizei depth, GLsizei imageSize, const void *pixels) = 0;
-    virtual void subImage(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels) = 0;
-    virtual void subImageCompressed(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels) = 0;
-    virtual void storage(GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) = 0;
-
-    virtual unsigned int getRenderTargetSerial(GLint level, GLint layer) = 0;
-
-    virtual RenderTarget *getRenderTarget(GLint level, GLint layer) = 0;
-    virtual RenderTarget *getDepthStencil(GLint level, GLint layer) = 0;
 };
 
 }

src/libGLESv2/renderer/d3d/TextureStorage.cpp

@@ -117,7 +117,7 @@ void TextureStorageInterfaceCube::generateMipmap(int faceIndex, int level)
 
 unsigned int TextureStorageInterfaceCube::getRenderTargetSerial(GLenum target, GLint level) const
 {
-    return mFirstRenderTargetSerial + (level * 6) + TextureD3D_Cube::targetToIndex(target);
+    return mFirstRenderTargetSerial + (level * 6) + gl::TextureCubeMap::targetToLayerIndex(target);
 }
 
 TextureStorageInterface3D::TextureStorageInterface3D(Renderer *renderer, GLenum internalformat, bool renderTarget,

src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp

@@ -473,7 +473,9 @@ void Renderer11::setTexture(gl::SamplerType type, int index, gl::Texture *textur
 
     if (texture)
     {
-        TextureStorageInterface *texStorage = texture->getNativeTexture();
+        TextureImpl* textureImpl = texture->getImplementation();
+
+        TextureStorageInterface *texStorage = textureImpl->getNativeTexture();
         if (texStorage)
         {
             TextureStorage11 *storage11 = TextureStorage11::makeTextureStorage11(texStorage->getStorageInstance());
@@ -486,7 +488,6 @@ void Renderer11::setTexture(gl::SamplerType type, int index, gl::Texture *textur
         // missing the shader resource view
         ASSERT(textureSRV != NULL);
 
-        TextureD3D* textureImpl = TextureD3D::makeTextureD3D(texture->getImplementation());
         forceSetTexture = textureImpl->hasDirtyImages();
         textureImpl->resetDirty();
     }

src/libGLESv2/renderer/d3d/d3d11/TextureStorage11.cpp

@@ -778,7 +778,7 @@ RenderTarget *TextureStorage11_Cube::getRenderTargetFace(GLenum faceTarget, int
 {
     if (level >= 0 && level < getLevelCount())
     {
-        int faceIndex = TextureD3D_Cube::targetToIndex(faceTarget);
+        int faceIndex = gl::TextureCubeMap::targetToLayerIndex(faceTarget);
         if (!mRenderTarget[faceIndex][level])
         {
             ID3D11Device *device = mRenderer->getDevice();

src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp

@@ -661,7 +661,9 @@ void Renderer9::setTexture(gl::SamplerType type, int index, gl::Texture *texture
 
     if (texture)
     {
-        TextureStorageInterface *texStorage = texture->getNativeTexture();
+        TextureImpl* textureImpl = texture->getImplementation();
+
+        TextureStorageInterface *texStorage = textureImpl->getNativeTexture();
         if (texStorage)
         {
             TextureStorage9 *storage9 = TextureStorage9::makeTextureStorage9(texStorage->getStorageInstance());
@@ -671,8 +673,6 @@ void Renderer9::setTexture(gl::SamplerType type, int index, gl::Texture *texture
         // in the texture class and we're unexpectedly missing the d3d texture
         ASSERT(d3dTexture != NULL);
 
-        TextureD3D* textureImpl = TextureD3D::makeTextureD3D(texture->getImplementation());
-
         serial = texture->getTextureSerial();
         forceSetTexture = textureImpl->hasDirtyImages();
         textureImpl->resetDirty();

src/libGLESv2/renderer/d3d/d3d9/TextureStorage9.cpp

@@ -266,7 +266,7 @@ IDirect3DSurface9 *TextureStorage9_Cube::getCubeMapSurface(GLenum faceTarget, in
 
 RenderTarget *TextureStorage9_Cube::getRenderTargetFace(GLenum faceTarget, int level)
 {
-    return mRenderTarget[TextureD3D_Cube::targetToIndex(faceTarget)];
+    return mRenderTarget[gl::TextureCubeMap::targetToLayerIndex(faceTarget)];
 }
 
 void TextureStorage9_Cube::generateMipmap(int faceIndex, int level)