Skip to content

A
angle
Commit 169d1118 by Jamie Madill
Options

Rename Texture and Image methods which operate on storage objects to refer to…

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
parent 22f843a1
Showing with 63 additions and 63 deletions
src/libGLESv2/Texture.cpp
......@@ -301,7 +301,7 @@ rx::TextureStorageInterface *Texture::getNativeTexture()
rx::TextureStorageInterface *storage = getStorage(false);
if (storage)
{
updateTexture();
updateStorage();
}
return storage;
......@@ -529,7 +529,7 @@ void Texture2D::commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei wi
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 @@ void Texture2D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo
if (level < levelCount())
{
updateTextureLevel(level);
updateStorageLevel(level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
......@@ -828,7 +828,7 @@ void Texture2D::createTexture()
mDirtyImages = true;
}
void Texture2D::updateTexture()
void Texture2D::updateStorage()
{
int storageLevels = levelCount();
......@@ -836,12 +836,12 @@ void Texture2D::updateTexture()
{
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 @@ rx::RenderTarget *Texture2D::getRenderTarget(GLint level)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
......@@ -966,7 +966,7 @@ rx::RenderTarget *Texture2D::getDepthSencil(GLint level)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is actually a depth texture
if (!isDepth(level))
......@@ -1101,7 +1101,7 @@ void TextureCubeMap::commitRect(int faceIndex, GLint level, GLint xoffset, GLint
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 @@ void TextureCubeMap::createTexture()
mDirtyImages = true;
}
void TextureCubeMap::updateTexture()
void TextureCubeMap::updateStorage()
{
int storageLevels = levelCount();
......@@ -1311,13 +1311,13 @@ void TextureCubeMap::updateTexture()
{
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 @@ void TextureCubeMap::copySubImage(GLenum target, GLint level, GLint xoffset, GLi
if (level < levelCount())
{
updateTextureFaceLevel(faceIndex, level);
updateStorageFaceLevel(faceIndex, level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
......@@ -1609,7 +1609,7 @@ rx::RenderTarget *TextureCubeMap::getRenderTarget(GLenum target, GLint level)
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 @@ rx::RenderTarget *TextureCubeMap::getDepthStencil(GLenum target, GLint level)
return NULL;
}
updateTextureFaceLevel(targetToIndex(target), level);
updateStorageFaceLevel(targetToIndex(target), level);
// ensure this is a depth texture
if (!isDepth(target, level))
......@@ -1879,7 +1879,7 @@ void Texture3D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo
if (level < levelCount())
{
updateTextureLevel(level);
updateStorageLevel(level);
gl::Rectangle sourceRect;
sourceRect.x = x;
......@@ -2036,7 +2036,7 @@ void Texture3D::createTexture()
mDirtyImages = true;
}
void Texture3D::updateTexture()
void Texture3D::updateStorage()
{
int storageLevels = levelCount();
......@@ -2044,12 +2044,12 @@ void Texture3D::updateTexture()
{
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 @@ rx::RenderTarget *Texture3D::getRenderTarget(GLint level)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
......@@ -2122,7 +2122,7 @@ rx::RenderTarget *Texture3D::getRenderTarget(GLint level, GLint layer)
return NULL;
}
updateTexture();
updateStorage();
// ensure this is NOT a depth texture
if (isDepth(level))
......@@ -2141,7 +2141,7 @@ rx::RenderTarget *Texture3D::getDepthStencil(GLint level, GLint layer)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is a depth texture
if (!isDepth(level))
......@@ -2206,7 +2206,7 @@ void Texture3D::commitRect(GLint level, GLint xoffset, GLint yoffset, GLint zoff
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 @@ void Texture2DArray::copySubImage(GLenum target, GLint level, GLint xoffset, GLi
if (level < levelCount())
{
updateTextureLevel(level);
updateStorageLevel(level);
GLuint clientVersion = mRenderer->getCurrentClientVersion();
......@@ -2612,7 +2612,7 @@ void Texture2DArray::createTexture()
mDirtyImages = true;
}
void Texture2DArray::updateTexture()
void Texture2DArray::updateStorage()
{
int storageLevels = levelCount();
......@@ -2620,12 +2620,12 @@ void Texture2DArray::updateTexture()
{
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 @@ rx::RenderTarget *Texture2DArray::getRenderTarget(GLint level, GLint layer)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is NOT a depth texture
if (isDepth(level))
......@@ -2704,7 +2704,7 @@ rx::RenderTarget *Texture2DArray::getDepthStencil(GLint level, GLint layer)
return NULL;
}
updateTextureLevel(level);
updateStorageLevel(level);
// ensure this is a depth texture
if (!isDepth(level))
......@@ -2789,7 +2789,7 @@ void Texture2DArray::commitRect(GLint level, GLint xoffset, GLint yoffset, GLint
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();
}
......
src/libGLESv2/Texture.h
......@@ -128,7 +128,7 @@ class Texture : public RefCountObject
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 @@ class Texture2D : public Texture
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 @@ class TextureCubeMap : public Texture
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 @@ class Texture3D : public Texture
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 @@ class Texture3D : public Texture
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 @@ class Texture2DArray : public Texture
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 @@ class Texture2DArray : public Texture
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
......
src/libGLESv2/renderer/Image.h
......@@ -48,10 +48,10 @@ class Image
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;
......
src/libGLESv2/renderer/d3d11/Image11.cpp
......@@ -84,25 +84,25 @@ bool Image11::isDirty() const
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);
......
src/libGLESv2/renderer/d3d11/Image11.h
......@@ -38,10 +38,10 @@ class Image11 : public Image
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);
......
src/libGLESv2/renderer/d3d9/Image9.cpp
......@@ -271,35 +271,35 @@ void Image9::setManagedSurface(IDirect3DSurface9 *surface)
}
}
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;
......
src/libGLESv2/renderer/d3d9/Image9.h
......@@ -46,10 +46,10 @@ class Image9 : public Image
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 @@ class Image9 : public Image
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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment