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
diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index cc79d25..87b8291 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -301,7 +301,7 @@
rx::TextureStorageInterface *storage = getStorage(false);
if (storage)
{
- updateTexture();
+ updateStorage();
}
return storage;
@@ -529,7 +529,7 @@
if (level < levelCount())
{
rx::Image *image = mImageArray[level];
- if (image->updateSurface(mTexStorage, level, xoffset, yoffset, width, height))
+ if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, width, height))
{
image->markClean();
}
@@ -620,7 +620,7 @@
if (level < levelCount())
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
@@ -828,7 +828,7 @@
mDirtyImages = true;
}
-void Texture2D::updateTexture()
+void Texture2D::updateStorage()
{
int storageLevels = levelCount();
@@ -836,12 +836,12 @@
{
if (isLevelComplete(level))
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
}
}
}
-void Texture2D::updateTextureLevel(int level)
+void Texture2D::updateStorageLevel(int level)
{
ASSERT(level <= (int)ArraySize(mImageArray) && mImageArray[level] != NULL);
ASSERT(isLevelComplete(level));
@@ -947,7 +947,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
@@ -966,7 +966,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is actually a depth texture
if (!isDepth(level))
@@ -1101,7 +1101,7 @@
if (level < levelCount())
{
rx::Image *image = mImageArray[faceIndex][level];
- if (image->updateSurface(mTexStorage, faceIndex, level, xoffset, yoffset, width, height))
+ if (image->copyToStorage(mTexStorage, faceIndex, level, xoffset, yoffset, width, height))
image->markClean();
}
}
@@ -1301,7 +1301,7 @@
mDirtyImages = true;
}
-void TextureCubeMap::updateTexture()
+void TextureCubeMap::updateStorage()
{
int storageLevels = levelCount();
@@ -1311,13 +1311,13 @@
{
if (isFaceLevelComplete(face, level))
{
- updateTextureFaceLevel(face, level);
+ updateStorageFaceLevel(face, level);
}
}
}
}
-void TextureCubeMap::updateTextureFaceLevel(int faceIndex, int level)
+void TextureCubeMap::updateStorageFaceLevel(int faceIndex, int level)
{
ASSERT(level >= 0 && faceIndex < 6 && level < (int)ArraySize(mImageArray[faceIndex]) && mImageArray[faceIndex][level] != NULL);
rx::Image *image = mImageArray[faceIndex][level];
@@ -1478,7 +1478,7 @@
if (level < levelCount())
{
- updateTextureFaceLevel(faceIndex, level);
+ updateStorageFaceLevel(faceIndex, level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
@@ -1609,7 +1609,7 @@
return NULL;
}
- updateTextureFaceLevel(targetToIndex(target), level);
+ updateStorageFaceLevel(targetToIndex(target), level);
// ensure this is NOT a depth texture
if (isDepth(target, level))
@@ -1630,7 +1630,7 @@
return NULL;
}
- updateTextureFaceLevel(targetToIndex(target), level);
+ updateStorageFaceLevel(targetToIndex(target), level);
// ensure this is a depth texture
if (!isDepth(target, level))
@@ -1879,7 +1879,7 @@
if (level < levelCount())
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
gl::Rectangle sourceRect;
sourceRect.x = x;
@@ -2036,7 +2036,7 @@
mDirtyImages = true;
}
-void Texture3D::updateTexture()
+void Texture3D::updateStorage()
{
int storageLevels = levelCount();
@@ -2044,12 +2044,12 @@
{
if (isLevelComplete(level))
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
}
}
}
-void Texture3D::updateTextureLevel(int level)
+void Texture3D::updateStorageLevel(int level)
{
ASSERT(level >= 0 && level < (int)ArraySize(mImageArray) && mImageArray[level] != NULL);
ASSERT(isLevelComplete(level));
@@ -2103,7 +2103,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
@@ -2122,7 +2122,7 @@
return NULL;
}
- updateTexture();
+ updateStorage();
// ensure this is NOT a depth texture
if (isDepth(level))
@@ -2141,7 +2141,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is a depth texture
if (!isDepth(level))
@@ -2206,7 +2206,7 @@
if (level < levelCount())
{
rx::Image *image = mImageArray[level];
- if (image->updateSurface(mTexStorage, level, xoffset, yoffset, zoffset, width, height, depth))
+ if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, zoffset, width, height, depth))
{
image->markClean();
}
@@ -2453,7 +2453,7 @@
if (level < levelCount())
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
@@ -2612,7 +2612,7 @@
mDirtyImages = true;
}
-void Texture2DArray::updateTexture()
+void Texture2DArray::updateStorage()
{
int storageLevels = levelCount();
@@ -2620,12 +2620,12 @@
{
if (isLevelComplete(level))
{
- updateTextureLevel(level);
+ updateStorageLevel(level);
}
}
}
-void Texture2DArray::updateTextureLevel(int level)
+void Texture2DArray::updateStorageLevel(int level)
{
ASSERT(level >= 0 && level < (int)ArraySize(mLayerCounts));
ASSERT(isLevelComplete(level));
@@ -2685,7 +2685,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
@@ -2704,7 +2704,7 @@
return NULL;
}
- updateTextureLevel(level);
+ updateStorageLevel(level);
// ensure this is a depth texture
if (!isDepth(level))
@@ -2789,7 +2789,7 @@
if (level < levelCount() && layerTarget < getDepth(level))
{
rx::Image *image = mImageArray[level][layerTarget];
- if (image->updateSurface(mTexStorage, level, xoffset, yoffset, layerTarget, width, height))
+ if (image->copyToStorage(mTexStorage, level, xoffset, yoffset, layerTarget, width, height))
{
image->markClean();
}
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
diff --git a/src/libGLESv2/renderer/Image.h b/src/libGLESv2/renderer/Image.h
index b24a524..73e4e84 100644
--- a/src/libGLESv2/renderer/Image.h
+++ b/src/libGLESv2/renderer/Image.h
@@ -48,10 +48,10 @@
virtual void setManagedSurface(TextureStorageInterfaceCube *storage, int face, int level) {};
virtual void setManagedSurface(TextureStorageInterface3D *storage, int level) {};
virtual void setManagedSurface(TextureStorageInterface2DArray *storage, int layer, int level) {};
- virtual bool updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height) = 0;
- virtual bool updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height) = 0;
- virtual bool updateSurface(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth) = 0;
- virtual bool updateSurface(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height) = 0;
+ virtual bool copyToStorage(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height) = 0;
+ virtual bool copyToStorage(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height) = 0;
+ virtual bool copyToStorage(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth) = 0;
+ virtual bool copyToStorage(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height) = 0;
virtual bool redefine(Renderer *renderer, GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, bool forceRelease) = 0;
diff --git a/src/libGLESv2/renderer/d3d11/Image11.cpp b/src/libGLESv2/renderer/d3d11/Image11.cpp
index 26bc773..304d468 100644
--- a/src/libGLESv2/renderer/d3d11/Image11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Image11.cpp
@@ -84,25 +84,25 @@
return (mStagingTexture && mDirty);
}
-bool Image11::updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+bool Image11::copyToStorage(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{
TextureStorage11_2D *storage11 = TextureStorage11_2D::makeTextureStorage11_2D(storage->getStorageInstance());
return storage11->updateSubresourceLevel(getStagingTexture(), getStagingSubresource(), level, 0, xoffset, yoffset, 0, width, height, 1);
}
-bool Image11::updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+bool Image11::copyToStorage(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{
TextureStorage11_Cube *storage11 = TextureStorage11_Cube::makeTextureStorage11_Cube(storage->getStorageInstance());
return storage11->updateSubresourceLevel(getStagingTexture(), getStagingSubresource(), level, face, xoffset, yoffset, 0, width, height, 1);
}
-bool Image11::updateSurface(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
+bool Image11::copyToStorage(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
{
TextureStorage11_3D *storage11 = TextureStorage11_3D::makeTextureStorage11_3D(storage->getStorageInstance());
return storage11->updateSubresourceLevel(getStagingTexture(), getStagingSubresource(), level, 0, xoffset, yoffset, zoffset, width, height, depth);
}
-bool Image11::updateSurface(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint arrayLayer, GLsizei width, GLsizei height)
+bool Image11::copyToStorage(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint arrayLayer, GLsizei width, GLsizei height)
{
TextureStorage11_2DArray *storage11 = TextureStorage11_2DArray::makeTextureStorage11_2DArray(storage->getStorageInstance());
return storage11->updateSubresourceLevel(getStagingTexture(), getStagingSubresource(), level, arrayLayer, xoffset, yoffset, 0, width, height, 1);
diff --git a/src/libGLESv2/renderer/d3d11/Image11.h b/src/libGLESv2/renderer/d3d11/Image11.h
index bb6e71e..300774c 100644
--- a/src/libGLESv2/renderer/d3d11/Image11.h
+++ b/src/libGLESv2/renderer/d3d11/Image11.h
@@ -38,10 +38,10 @@
virtual bool isDirty() const;
- virtual bool updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
- virtual bool updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
- virtual bool updateSurface(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
- virtual bool updateSurface(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint arrayLayer, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+ virtual bool copyToStorage(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint arrayLayer, GLsizei width, GLsizei height);
virtual bool redefine(Renderer *renderer, GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, bool forceRelease);
diff --git a/src/libGLESv2/renderer/d3d9/Image9.cpp b/src/libGLESv2/renderer/d3d9/Image9.cpp
index 009104e..17fa716 100644
--- a/src/libGLESv2/renderer/d3d9/Image9.cpp
+++ b/src/libGLESv2/renderer/d3d9/Image9.cpp
@@ -271,35 +271,35 @@
}
}
-bool Image9::updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+bool Image9::copyToStorage(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{
ASSERT(getSurface() != NULL);
TextureStorage9_2D *storage9 = TextureStorage9_2D::makeTextureStorage9_2D(storage->getStorageInstance());
- return updateSurface(storage9->getSurfaceLevel(level, true), xoffset, yoffset, width, height);
+ return copyToSurface(storage9->getSurfaceLevel(level, true), xoffset, yoffset, width, height);
}
-bool Image9::updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+bool Image9::copyToStorage(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{
ASSERT(getSurface() != NULL);
TextureStorage9_Cube *storage9 = TextureStorage9_Cube::makeTextureStorage9_Cube(storage->getStorageInstance());
- return updateSurface(storage9->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, true), xoffset, yoffset, width, height);
+ return copyToSurface(storage9->getCubeMapSurface(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, level, true), xoffset, yoffset, width, height);
}
-bool Image9::updateSurface(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
+bool Image9::copyToStorage(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
{
// 3D textures are not supported by the D3D9 backend.
UNREACHABLE();
return false;
}
-bool Image9::updateSurface(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height)
+bool Image9::copyToStorage(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height)
{
// 2D array textures are not supported by the D3D9 backend.
UNREACHABLE();
return false;
}
-bool Image9::updateSurface(IDirect3DSurface9 *destSurface, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
+bool Image9::copyToSurface(IDirect3DSurface9 *destSurface, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height)
{
if (!destSurface)
return false;
diff --git a/src/libGLESv2/renderer/d3d9/Image9.h b/src/libGLESv2/renderer/d3d9/Image9.h
index 4e0acad..286fcd1 100644
--- a/src/libGLESv2/renderer/d3d9/Image9.h
+++ b/src/libGLESv2/renderer/d3d9/Image9.h
@@ -46,10 +46,10 @@
virtual void setManagedSurface(TextureStorageInterface2D *storage, int level);
virtual void setManagedSurface(TextureStorageInterfaceCube *storage, int face, int level);
- virtual bool updateSurface(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
- virtual bool updateSurface(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
- virtual bool updateSurface(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
- virtual bool updateSurface(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterface2D *storage, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterfaceCube *storage, int face, int level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
+ virtual bool copyToStorage(TextureStorageInterface3D *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+ virtual bool copyToStorage(TextureStorageInterface2DArray *storage, int level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height);
virtual void loadData(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLint unpackAlignment, GLenum type, const void *input);
@@ -63,7 +63,7 @@
void createSurface();
void setManagedSurface(IDirect3DSurface9 *surface);
- bool updateSurface(IDirect3DSurface9 *dest, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
+ bool copyToSurface(IDirect3DSurface9 *dest, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
HRESULT lock(D3DLOCKED_RECT *lockedRect, const RECT *rect);
void unlock();