summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/tdfx
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2004-10-18 00:00:41 +0000
committerIan Romanick <[email protected]>2004-10-18 00:00:41 +0000
commitb430a1ae226308c04dab2a62b5e9127dfed25b2c (patch)
treede1a1534de592ced5cdc11295ba1541574ed0d1e /src/mesa/drivers/dri/tdfx
parent48da4a4a86fb17d972c4aa536a18988a3cdc51c1 (diff)
Fix compile errors when DEBUG is defined.
Diffstat (limited to 'src/mesa/drivers/dri/tdfx')
-rw-r--r--src/mesa/drivers/dri/tdfx/tdfx_tex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index 4d92739fe60..c6fa3505b34 100644
--- 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: