summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorMikko Juola <mikjuo@gmail.com>2013-07-30 06:36:43 +0300
committerIan Romanick <ian.d.romanick@intel.com>2013-08-05 17:07:06 -0700
commitb61036fa2d4e79e7507e671f18766400502be9a7 (patch)
treee65629cbd4d034af0a070fa67d937b120f066130 /src/mesa
parentddf6f591a9f84ece7a360273f75e687a2161a39b (diff)
mesa: fix proxy textures becoming immutable and unusable
glTexStorage*() functions make textures immutable. This carries on to proxy textures. Error checking in texture storage functions prevents proxy textures from working after first time because internally, they became immutable. This commit makes the error checking ignore the immutability flag when working with proxy textures. Reviewed-by: Brian Paul <brianp@vmware.com> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit e404105e7dc192ddfb88b80df4238a97caedf32e)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texstorage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c
index 77988971053..7bd8652b540 100644
--- a/src/mesa/main/texstorage.c
+++ b/src/mesa/main/texstorage.c
@@ -342,7 +342,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target,
}
/* Check if texObj->Immutable is set */
- if (texObj->Immutable) {
+ if (!_mesa_is_proxy_texture(target) && texObj->Immutable) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(immutable)",
dims);
return GL_TRUE;