From: Mikko Juola <mikjuo@gmail.com>
Date: Tue, 30 Jul 2013 03:36:43 +0000 (+0300)
Subject: mesa: fix proxy textures becoming immutable and unusable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e404105e7dc192ddfb88b80df4238a97caedf32e;p=mesa.git

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
---

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;