Mesa (gallium-mesa-7.4): mesa: fix incorrect call to clear_teximage_fields( ) in _mesa_TexImage2D()

Alan Hourihane alanh at kemper.freedesktop.org
Tue Feb 3 02:17:01 PST 2009


Module: Mesa
Branch: gallium-mesa-7.4
Commit: b543401a5cac8203c978da5d37b877469fbe6c86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b543401a5cac8203c978da5d37b877469fbe6c86

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 30 16:06:52 2009 -0700

mesa: fix incorrect call to clear_teximage_fields() in _mesa_TexImage2D()

Fixes failed assertion / segfault for particular proxy texture tests.

(cherry picked from master, commit ea4b183b8c3730ec2c6b5152cad1a68889634487)

---

 src/mesa/main/teximage.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9e968ba..a437b9c 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2603,7 +2603,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                               1, border)) {
          /* when error, clear all proxy texture image parameters */
          if (texImage)
-            clear_teximage_fields(ctx->Texture.ProxyTex[TEXTURE_2D_INDEX]->Image[0][level]);
+            clear_teximage_fields(texImage);
       }
       else {
          /* no error, set the tex image parameters */



More information about the mesa-commit mailing list