fix up radeon span functions using latest r200 code from Brian,

[mesa.git] / src / mesa / drivers / dri / s3v / s3v_tex.c

diff --git a/src/mesa/drivers/dri/s3v/s3v_tex.c b/src/mesa/drivers/dri/s3v/s3v_tex.c
index 80564101ec26ea4b121c70512bc413f78d492f1c..5bee051b092ba4e0cde280a3cc91061e35489bbb 100644 (file)
--- a/src/mesa/drivers/dri/s3v/s3v_tex.c
+++ b/src/mesa/drivers/dri/s3v/s3v_tex.c
@@ -7,15 +7,14 @@
 
 #include "glheader.h"
 #include "mtypes.h"
-#include "mem.h"
 #include "simple_list.h"
 #include "enums.h"
 #include "texstore.h"
 #include "texformat.h"
+#include "teximage.h"
 #include "swrast/swrast.h"
 
 #include "mm.h"
-#include "mmath.h"
 #include "s3v_context.h"
 #include "s3v_tex.h"
 
@@ -37,8 +36,8 @@ static void s3vSetTexWrapping(s3vContextPtr vmesa,
                                s3vTextureObjectPtr t, 
                               GLenum wraps, GLenum wrapt)
 {
-       CARD32 t0 = t->TextureCMD;
-       CARD32 cmd = vmesa->CMD;
+       GLuint t0 = t->TextureCMD;
+       GLuint cmd = vmesa->CMD;
 #if TEX_DEBUG_ON
        static unsigned int times=0;
        DEBUG_TEX(("*** s3vSetTexWrapping: #%i ***\n", ++times));
@@ -64,8 +63,8 @@ static void s3vSetTexFilter(s3vContextPtr vmesa,
                             s3vTextureObjectPtr t, 
                             GLenum minf, GLenum magf)
 {
-       CARD32 t0 = t->TextureCMD;
-       CARD32 cmd = vmesa->CMD;
+       GLuint t0 = t->TextureCMD;
+       GLuint cmd = vmesa->CMD;
 #if TEX_DEBUG_ON
        static unsigned int times=0;
        DEBUG_TEX(("*** s3vSetTexFilter: #%i ***\n", ++times));
@@ -183,7 +182,7 @@ static void s3vTexParameter( GLcontext *ctx, GLenum target,
                break;
   
        case GL_TEXTURE_BORDER_COLOR:
-               s3vSetTexBorderColor( vmesa, t, tObj->BorderColor );
+               s3vSetTexBorderColor( vmesa, t, tObj->_BorderChan );
                break;
 
        case GL_TEXTURE_BASE_LEVEL:
@@ -402,7 +401,7 @@ static void s3vBindTexture( GLcontext *ctx, GLenum target,
 {
        s3vContextPtr vmesa = S3V_CONTEXT( ctx );
        s3vTextureObjectPtr t = (s3vTextureObjectPtr) tObj->DriverData;
-       CARD32 cmd = vmesa->CMD;
+       GLuint cmd = vmesa->CMD;
 #if TEX_DEBUG_ON
        static unsigned int times=0;
        DEBUG_TEX(("*** s3vBindTexture: #%i ***\n", ++times));
@@ -440,11 +439,6 @@ static void s3vBindTexture( GLcontext *ctx, GLenum target,
 #endif
        }
 
-       if (!ctx->Texture._ReallyEnabled) {
-               DEBUG_TEX(("!ctx->Texture._ReallyEnabled\n"));
-               return; 
-       }
-
        cmd = vmesa->CMD & ~MIP_MASK;
     vmesa->dirty |= S3V_UPLOAD_TEX0;
     vmesa->TexOffset = t->TextureBaseAddr[tObj->BaseLevel];