Mesa (7.9): tdfx: s/Format/_BaseFormat/

Brian Paul brianp at kemper.freedesktop.org
Tue Jan 4 15:01:34 UTC 2011


Module: Mesa
Branch: 7.9
Commit: 894145001076509dcdd1524c45c57fc2b8cefee8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=894145001076509dcdd1524c45c57fc2b8cefee8

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jan  4 07:53:44 2011 -0700

tdfx: s/Format/_BaseFormat/

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=31560
(cherry picked from commit d18df9e336b5d2e68a4a6185f7b9d0d0c095c3c4)

---

 src/mesa/drivers/dri/tdfx/tdfx_tex.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 1c51452..b75b3a4 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -698,8 +698,8 @@ convertPalette(FxU32 data[256], const struct gl_color_table *table)
         return GR_TEXTABLE_PALETTE_6666_EXT;
     default:
         /* XXX fixme: how can this happen? */
-        _mesa_error(NULL, GL_INVALID_ENUM, "convertPalette: table->Format == %s",
-                                           _mesa_lookup_enum_by_nr(table->Format));
+        _mesa_error(NULL, GL_INVALID_ENUM, "convertPalette: table->_BaseFormat == %s",
+                                           _mesa_lookup_enum_by_nr(table->_BaseFormat));
         return GR_TEXTABLE_PALETTE;
     }
 }




More information about the mesa-commit mailing list