summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/savage/savage_xmesa.c6
-rw-r--r--src/mesa/drivers/dri/savage/savagecontext.h6
-rw-r--r--src/mesa/drivers/dri/savage/savagespan.c20
-rw-r--r--src/mesa/drivers/dri/savage/savagestate.c4
-rw-r--r--src/mesa/drivers/dri/savage/savagetex.c2
5 files changed, 19 insertions, 19 deletions
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 522c6275c48..c3bf710e25d 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -213,7 +213,7 @@ savageInitDriver(__DRIscreenPrivate *sPriv)
savageScreen->agpTextures.map = NULL;
savageScreen->texVirtual[SAVAGE_CARD_HEAP] =
- (drmAddress)(((unsigned int)sPriv->pFB)+gDRIPriv->textureOffset);
+ (drmAddress)(((GLubyte *)sPriv->pFB)+gDRIPriv->textureOffset);
savageScreen->texVirtual[SAVAGE_AGP_HEAP] =
(drmAddress)(savageScreen->agpTextures.map);
@@ -364,8 +364,8 @@ savageCreateContext( const __GLcontextModes *mesaVis,
for(i=0;i<5;i++)
{
- imesa->apertureBase[i] = ((GLuint)savageScreen->aperture.map +
- 0x01000000 * i );
+ imesa->apertureBase[i] = (GLubyte *)savageScreen->aperture.map +
+ 0x01000000 * i;
}
imesa->aperturePitch = savageScreen->aperturePitch;
diff --git a/src/mesa/drivers/dri/savage/savagecontext.h b/src/mesa/drivers/dri/savage/savagecontext.h
index 95dedc13603..4c095996851 100644
--- a/src/mesa/drivers/dri/savage/savagecontext.h
+++ b/src/mesa/drivers/dri/savage/savagecontext.h
@@ -179,7 +179,7 @@ struct savage_context_t {
struct savage_vtxbuf_t *vtxBuf;
/* aperture base */
- GLuint apertureBase[5];
+ GLubyte *apertureBase[5];
GLuint aperturePitch;
/* Manage hardware state */
GLuint dirty;
@@ -236,8 +236,8 @@ struct savage_context_t {
/* These refer to the current draw (front vs. back) buffer:
*/
- char *drawMap; /* draw buffer address in virtual mem */
- char *readMap;
+ GLubyte *drawMap; /* draw buffer address in virtual mem */
+ GLubyte *readMap;
int drawX; /* origin of drawable in draw buffer */
int drawY;
GLuint numClipRects; /* cliprects for that buffer */
diff --git a/src/mesa/drivers/dri/savage/savagespan.c b/src/mesa/drivers/dri/savage/savagespan.c
index 8af0384b445..4fad537ba62 100644
--- a/src/mesa/drivers/dri/savage/savagespan.c
+++ b/src/mesa/drivers/dri/savage/savagespan.c
@@ -39,9 +39,9 @@
GLuint cpp = savageScreen->cpp; \
GLuint pitch = imesa->aperturePitch; \
GLuint height = dPriv->h; \
- char *buf = (char *)(map + \
- dPriv->x * cpp + \
- dPriv->y * pitch); \
+ GLubyte *buf = map + \
+ dPriv->x * cpp + \
+ dPriv->y * pitch; \
GLuint p; \
(void) p
@@ -52,9 +52,9 @@
GLuint zpp = savageScreen->zpp; \
GLuint pitch = imesa->aperturePitch; \
GLuint height = dPriv->h; \
- char *buf = (char *)(imesa->apertureBase[TARGET_DEPTH] + \
- dPriv->x * zpp + \
- dPriv->y * pitch)
+ GLubyte *buf = imesa->apertureBase[TARGET_DEPTH] + \
+ dPriv->x * zpp + \
+ dPriv->y * pitch
#define LOCAL_STENCIL_VARS LOCAL_DEPTH_VARS
@@ -80,11 +80,11 @@
#define HW_WRITE_LOCK() \
savageContextPtr imesa = SAVAGE_CONTEXT(ctx); \
- char *map = imesa->drawMap;
+ GLubyte *map = imesa->drawMap;
#define HW_READ_LOCK() \
savageContextPtr imesa = SAVAGE_CONTEXT(ctx); \
- char *map = imesa->readMap;
+ GLubyte *map = imesa->readMap;
#define HW_CLIPLOOP() \
do { \
@@ -233,8 +233,8 @@ static void savageDDSetBuffer(GLcontext *ctx, GLframebuffer *buffer,
assert((bufferBit == DD_FRONT_LEFT_BIT) || (bufferBit == DD_BACK_LEFT_BIT));
map = (bufferBit == DD_FRONT_LEFT_BIT)
- ? (char*)imesa->apertureBase[TARGET_FRONT]
- : (char*)imesa->apertureBase[TARGET_BACK];
+ ? imesa->apertureBase[TARGET_FRONT]
+ : imesa->apertureBase[TARGET_BACK];
imesa->drawMap = map;
imesa->readMap = map;
diff --git a/src/mesa/drivers/dri/savage/savagestate.c b/src/mesa/drivers/dri/savage/savagestate.c
index 6633c4e4764..c3df5f4f87d 100644
--- a/src/mesa/drivers/dri/savage/savagestate.c
+++ b/src/mesa/drivers/dri/savage/savagestate.c
@@ -1710,8 +1710,8 @@ void savageDDInitState( savageContextPtr imesa ) {
imesa->regs.s4.destCtrl.ni.dstWidthInTile =
(imesa->savageScreen->width+31)>>5;
}
- imesa->drawMap = (char *)imesa->apertureBase[imesa->toggle];
- imesa->readMap = (char *)imesa->apertureBase[imesa->toggle];
+ imesa->drawMap = imesa->apertureBase[imesa->toggle];
+ imesa->readMap = imesa->apertureBase[imesa->toggle];
imesa->NotFirstFrame = GL_FALSE;
imesa->regs.s4.zBufOffset.ni.offset=imesa->savageScreen->depthOffset>>11;
diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index b681b0293b4..6641231371e 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -768,7 +768,7 @@ static void savageUploadTexImages( savageContextPtr imesa, savageTexObjPtr t )
ofs = t->base.memBlock->ofs;
t->setup.physAddr = imesa->savageScreen->textureOffset[heap] + ofs;
- t->bufAddr = (char *)((GLuint) imesa->savageScreen->texVirtual[heap] + ofs);
+ t->bufAddr = (GLubyte *)imesa->savageScreen->texVirtual[heap] + ofs;
imesa->dirty |= SAVAGE_UPLOAD_GLOBAL; /* FIXME: really needed? */
}