diff options
| author | gareth <gareth> | 2001-03-14 04:36:11 +0000 |
|---|---|---|
| committer | gareth <gareth> | 2001-03-14 04:36:11 +0000 |
| commit | b4164fb80338d44569f432af82c91738bb3584e2 (patch) | |
| tree | 54443b09e5a2fd7494c7b81747fba050643b70c9 | |
| parent | 7adafe26b7f6d32e34d57db1f4b762aa309a4eca (diff) | |
Fix incorrect colors with texturing (Steven Fuller).full-1-0-0-branch
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c index e0f2d2eb0..92a0daa5b 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_tex.c @@ -101,7 +101,7 @@ static void tdfxTexGetInfo( const GLcontext *ctx, int w, int h, * |ar| > 3 by scaling the image and using an 8x1 aspect ratio. */ if ( ar >= 0 ) { - ASSERT( width >= height ); + ASSERT( w >= h ); lod = logw; s = 256.0; ws = 1; @@ -114,7 +114,7 @@ static void tdfxTexGetInfo( const GLcontext *ctx, int w, int h, hs = 1 << (ar - 3); } } else { - ASSERT( width < height ); + ASSERT( w < h ); lod = logh; t = 256.0; hs = 1; @@ -288,7 +288,7 @@ tdfxTexGetFormat( tdfxContextPtr fxMesa, struct gl_texture_image *texImage, } } if ( allow32bpp && is32bpp ) { - SET_FORMAT( GR_TEXFMT_ARGB_8888, _mesa_texformat_rgba8888 ); + SET_FORMAT( GR_TEXFMT_ARGB_8888, _mesa_texformat_argb8888 ); } else { SET_FORMAT( GR_TEXFMT_ARGB_4444, _mesa_texformat_argb4444 ); } @@ -301,7 +301,7 @@ tdfxTexGetFormat( tdfxContextPtr fxMesa, struct gl_texture_image *texImage, break; } if ( allow32bpp && is32bpp ) { - SET_FORMAT( GR_TEXFMT_ARGB_8888, _mesa_texformat_rgba8888 ); + SET_FORMAT( GR_TEXFMT_ARGB_8888, _mesa_texformat_argb8888 ); } else { SET_FORMAT( GR_TEXFMT_RGB_565, _mesa_texformat_rgb565 ); } |