commit 169d11186cb1fdef8920668169682cf84749606d
author Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:37 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Oct 24 17:49:37 2013 -0400
tree 4fce630607bce5e465e46ab805dc04f079848359
parent 22f843a1e1b9ede7ac1035923f99a7c5956a9bad

Rename Texture and Image methods which operate on storage objects to refer to storage instead of textures.

TRAC #23961

Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods

src/libGLESv2/Texture.h

diff --git a/src/libGLESv2/Texture.h b/src/libGLESv2/Texture.h
index 49acc54..cd4682e 100644
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -128,7 +128,7 @@
     int mipLevels() const;
 
     virtual void createTexture() = 0;
-    virtual void updateTexture() = 0;
+    virtual void updateStorage() = 0;
     virtual bool ensureRenderTarget() = 0;
 
     rx::Renderer *mRenderer;
@@ -197,14 +197,14 @@
     DISALLOW_COPY_AND_ASSIGN(Texture2D);
 
     virtual void createTexture();
-    virtual void updateTexture();
+    virtual void updateStorage();
     virtual bool ensureRenderTarget();
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;
 
     bool isMipmapComplete() const;
     bool isLevelComplete(int level) const;
-    void updateTextureLevel(int level);
+    void updateStorageLevel(int level);
 
     void redefineImage(GLint level, GLenum internalformat, GLsizei width, GLsizei height);
     void commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
@@ -264,14 +264,14 @@
     DISALLOW_COPY_AND_ASSIGN(TextureCubeMap);
 
     virtual void createTexture();
-    virtual void updateTexture();
+    virtual void updateStorage();
     virtual bool ensureRenderTarget();
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
     virtual const rx::Image *getBaseLevelImage() const;
 
     bool isMipmapCubeComplete() const;
     bool isFaceLevelComplete(int faceIndex, int level) const;
-    void updateTextureFaceLevel(int faceIndex, int level);
+    void updateStorageFaceLevel(int faceIndex, int level);
 
     void setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels);
     void commitRect(int faceIndex, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
@@ -323,7 +323,7 @@
     DISALLOW_COPY_AND_ASSIGN(Texture3D);
 
     virtual void createTexture();
-    virtual void updateTexture();
+    virtual void updateStorage();
     virtual bool ensureRenderTarget();
 
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
@@ -333,7 +333,7 @@
     void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
 
     bool isLevelComplete(int level) const;
-    void updateTextureLevel(int level);
+    void updateStorageLevel(int level);
 
     rx::Image *mImageArray[IMPLEMENTATION_MAX_TEXTURE_LEVELS];
 
@@ -380,7 +380,7 @@
     DISALLOW_COPY_AND_ASSIGN(Texture2DArray);
 
     virtual void createTexture();
-    virtual void updateTexture();
+    virtual void updateStorage();
     virtual bool ensureRenderTarget();
 
     virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
@@ -390,7 +390,7 @@
     void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint layerTarget, GLsizei width, GLsizei height);
 
     bool isLevelComplete(int level) const;
-    void updateTextureLevel(int level);
+    void updateStorageLevel(int level);
 
     // Storing images as an array of single depth textures since D3D11 treats each array level of a
     // Texture2D object as a separate subresource.  Each layer would have to be looped over