Fix compile errors when DEBUG is defined.

diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c
index 934ffc13493da6057da37d4969e0b6d611014de5..1e56c78f9bee0800d63dc3b3565e057cffb54aea 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_texstate.c
+++ b/src/mesa/drivers/dri/r200/r200_texstate.c
@@ -279,7 +279,7 @@ static void r200SetTexImages( r200ContextPtr rmesa,
       t->pp_txformat_x |= R200_TEXCOORD_VOLUME;
    }
    else if (tObj->Target == GL_TEXTURE_CUBE_MAP) {
-      ASSERT(log2Width == log2height);
+      ASSERT(log2Width == log2Height);
       t->pp_txformat |= ((log2Width << R200_TXFORMAT_F5_WIDTH_SHIFT) |
                          (log2Height << R200_TXFORMAT_F5_HEIGHT_SHIFT) |
                          (R200_TXFORMAT_CUBIC_MAP_ENABLE));
@@ -828,7 +828,7 @@ static void import_tex_obj_state( r200ContextPtr rmesa,
    if (texobj->base.tObj->Target == GL_TEXTURE_CUBE_MAP) {
       GLuint *cube_cmd = R200_DB_STATE( cube[unit] );
       GLuint bytesPerFace = texobj->base.totalSize / 6;
-      ASSERT(texobj->totalSize % 6 == 0);
+      ASSERT(texobj->base.totalSize % 6 == 0);
       cube_cmd[CUBE_PP_CUBIC_FACES] = texobj->pp_cubic_faces;
       cube_cmd[CUBE_PP_CUBIC_OFFSET_F1] = texobj->pp_txoffset + 1 * bytesPerFace;
       cube_cmd[CUBE_PP_CUBIC_OFFSET_F2] = texobj->pp_txoffset + 2 * bytesPerFace;

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 4d92739fe60af72996d6b3db3c2455321b4512f7..c6fa3505b34dccf99b1291f57090475932146d19 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -212,7 +212,7 @@ tdfxTexGetInfo(const GLcontext *ctx, int w, int h,
     /* Hardware only allows a maximum aspect ratio of 8x1, so handle
        |ar| > 3 by scaling the image and using an 8x1 aspect ratio */
     if (ar >= 0) {
-        ASSERT(width >= height);
+        ASSERT(w >= h);
         lod = logw;
         if (ar <= GR_ASPECT_LOG2_8x1) {
             t = 256 >> ar;
@@ -225,7 +225,7 @@ tdfxTexGetInfo(const GLcontext *ctx, int w, int h,
         }
     }
     else {
-        ASSERT(width < height);
+        ASSERT(w < h);
         lod = logh;
         if (ar >= GR_ASPECT_LOG2_1x8) {
             s = 256 >> -ar;
@@ -595,7 +595,7 @@ convertPalette(FxU32 data[256], const struct gl_color_table *table)
     FxU32 r, g, b, a;
     GLint i;
 
-    ASSERT(table->TableType == GL_UNSIGNED_BYTE);
+    ASSERT(table->Type == GL_UNSIGNED_BYTE);
 
     switch (table->Format) {
     case GL_INTENSITY: