diff options
| author | Adam Jackson <[email protected]> | 2004-12-27 20:31:56 +0000 |
|---|---|---|
| committer | Adam Jackson <[email protected]> | 2004-12-27 20:31:56 +0000 |
| commit | c3eaa17b37ef83d43a4de211c1b4f616b3bc0a3d (patch) | |
| tree | b1cee126821cce46d6d1b86dbe8a5b9e4c6e27ce /src/mesa/drivers/dri/s3v/s3v_texmem.c | |
| parent | 99edafd4e87fdfb53a46d10d497250a9ba1fa91b (diff) | |
Get s3v building with a minimum of warnings.
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_texmem.c')
| -rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_texmem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_texmem.c b/src/mesa/drivers/dri/s3v/s3v_texmem.c index ab2e67d1826..0ce3ff5fc23 100644 --- a/src/mesa/drivers/dri/s3v/s3v_texmem.c +++ b/src/mesa/drivers/dri/s3v/s3v_texmem.c @@ -12,7 +12,6 @@ #include "enums.h" #include "mm.h" -#include "mem.h" #include "s3v_context.h" #include "s3v_lock.h" #include "s3v_tex.h" @@ -103,7 +102,7 @@ static void s3vUploadTexLevel( s3vContextPtr vmesa, s3vTextureObjectPtr t, int l2d; /* int offset = 0; */ int words; - CARD32* dest; + GLuint* dest; #if TEX_DEBUG_ON static unsigned int times=0; #endif @@ -121,9 +120,9 @@ static void s3vUploadTexLevel( s3vContextPtr vmesa, s3vTextureObjectPtr t, DEBUG_TEX(("t->image[%i].offset = 0x%x\n", level, t->image[level].offset)); - t->TextureBaseAddr[level] = (CARD32)(t->BufAddr + t->image[level].offset - + _TEXALIGN) & (CARD32)(~_TEXALIGN); - dest = (CARD32*)(sPriv->pFB + t->TextureBaseAddr[level]); + t->TextureBaseAddr[level] = (GLuint)(t->BufAddr + t->image[level].offset + + _TEXALIGN) & (GLuint)(~_TEXALIGN); + dest = (GLuint*)(sPriv->pFB + t->TextureBaseAddr[level]); DEBUG_TEX(("sPriv->pFB = 0x%x\n", sPriv->pFB)); DEBUG_TEX(("dest = 0x%x\n", dest)); |