Remove references to the Image class from gl::Texture and rx::TextureImpl.

src/libANGLE/Texture.h

@@ -28,17 +28,9 @@ namespace egl
 class Surface;
 }
 
-namespace rx
-{
-class TextureStorageInterface;
-class Image;
-}
-
 namespace gl
 {
 class Framebuffer;
-class FramebufferAttachment;
-struct ImageIndex;
 struct Data;
 
 bool IsMipmapFiltered(const gl::SamplerState &samplerState);

src/libANGLE/renderer/TextureImpl.h

@@ -37,18 +37,11 @@ struct SamplerState;
 namespace rx
 {
 
-class Image;
-
 class TextureImpl
 {
   public:
     virtual ~TextureImpl() {};
 
-    // Deprecated in favour of the ImageIndex method
-    virtual Image *getImage(int level, int layer) const = 0;
-    virtual Image *getImage(const gl::ImageIndex &index) const = 0;
-    virtual GLsizei getLayerCount(int level) const = 0;
-
     virtual void setUsage(GLenum usage) = 0;
 
     virtual gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type,

src/libANGLE/renderer/d3d/TextureD3D.h

@@ -41,6 +41,9 @@ class TextureD3D : public TextureImpl
     bool hasDirtyImages() const { return mDirtyImages; }
     void resetDirty() { mDirtyImages = false; }
 
+    virtual Image *getImage(const gl::ImageIndex &index) const = 0;
+    virtual GLsizei getLayerCount(int level) const = 0;
+
     GLint getBaseLevelWidth() const;
     GLint getBaseLevelHeight() const;
     GLint getBaseLevelDepth() const;