Skip to content

A
angle
Commit 07edd448 by Jamie Madill Committed by Shannon Woods
Options

Change the checks for texture completeness in Texture*::copySubImage to only…

Change the checks for texture completeness in Texture*::copySubImage to only check if the specified level is complete. This removes the dependency between copySubImage and isSamplerComplete, which makes operation with sampler objects simpler. TRAC #23453 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Authored-by: Jamie Madill
parent eb3665c2
Showing with 10 additions and 0 deletions
src/libGLESv2/Texture.h
...@@ -190,6 +190,8 @@ class Texture2D : public Texture ...@@ -190,6 +190,8 @@ class Texture2D : public Texture
virtual rx::TextureStorageInterface *getStorage(bool renderTarget); virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
bool isMipmapComplete() const; bool isMipmapComplete() const;
bool isLevelComplete(int level) const;
void updateTextureLevel(int level);
void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height); void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height);
void commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height); void commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
...@@ -264,6 +266,8 @@ class TextureCubeMap : public Texture ...@@ -264,6 +266,8 @@ class TextureCubeMap : public Texture
bool isCubeComplete() const; bool isCubeComplete() const;
bool isMipmapCubeComplete() const; bool isMipmapCubeComplete() const;
bool isFaceLevelComplete(int face, int level) const;
void updateTextureFaceLevel(int face, int level);
void setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLint internalFormat, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels); void setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLint internalFormat, GLenum format, GLenum type, GLint unpackAlignment, const void *pixels);
void commitRect(int faceIndex, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height); void commitRect(int faceIndex, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
...@@ -332,6 +336,9 @@ class Texture3D : public Texture ...@@ -332,6 +336,9 @@ class Texture3D : public Texture
void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth); void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth);
void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); 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);
rx::Image *mImageArray[IMPLEMENTATION_MAX_TEXTURE_LEVELS]; rx::Image *mImageArray[IMPLEMENTATION_MAX_TEXTURE_LEVELS];
rx::TextureStorageInterface3D *mTexStorage; rx::TextureStorageInterface3D *mTexStorage;
...@@ -395,6 +402,9 @@ class Texture2DArray : public Texture ...@@ -395,6 +402,9 @@ class Texture2DArray : public Texture
void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth); void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth);
void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint layerTarget, GLsizei width, GLsizei height); void commitRect(GLint level, GLint xoffset, GLint yoffset, GLint layerTarget, GLsizei width, GLsizei height);
bool isLevelComplete(int level) const;
void updateTextureLevel(int level);
// Storing images as an array of single depth textures since D3D11 treats each array level of a // 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 // Texture2D object as a separate subresource. Each layer would have to be looped over
// to update all the texture layers since they cannot all be updated at once and it makes the most // to update all the texture layers since they cannot all be updated at once and it makes the most
......
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