[Dri-devel] tdfx mesa-4-0-branch patch.

[Steven Fuller]

This patch is for mesa-4-0-branch.

---------- Forwarded message ----------
Date: Wed, 3 Oct 2001 20:46:37 -0500 (CDT)
From: Steven Fuller <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]


This small patch fixes/works around a problem with tdfxDDTexturePalette
when glColorTable() is used with a proxy texture (it tries to access a
non-existent color table).


Steven Fuller




Index: tdfx_tex.c
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c,v
retrieving revision 1.2.2.14
diff -u -r1.2.2.14 tdfx_tex.c
--- tdfx_tex.c  2001/06/05 17:34:16     1.2.2.14
+++ tdfx_tex.c  2001/10/04 01:32:59
@@ -542,6 +542,11 @@
     if (tObj) {
         /* per-texture palette */
         tdfxTexInfo *ti;
+        
+        /* This might be a proxy texture. */
+        if (!tObj->Palette.Table)
+            return;
+            
         if (!tObj->DriverData)
             tObj->DriverData = fxAllocTexObjData(fxMesa);
         ti = TDFX_TEXTURE_DATA(tObj);