Attachment 2347 Details for Bug 2924 – Fixes for point-to-int casts in the Savage driver

[patch] Fixes for point-to-int casts in the Savage driver

savage_pointercasts.diff (text/plain), 4.23 KB, created by Felix Kühling on 2005-04-07 13:23:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Kühling

Created: 2005-04-07 13:23:32 UTC

Size: 4.23 KB

patch

obsolete

>--- ./savagespan.c.~1.7.~	2005-01-22 14:12:11.000000000 +0100
>+++ ./savagespan.c	2005-04-07 22:09:35.000000000 +0200
>@@ -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 @@
>    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;
>--- ./savagecontext.h.~1.22.~	2005-03-06 04:55:33.000000000 +0100
>+++ ./savagecontext.h	2005-04-07 22:05:36.000000000 +0200
>@@ -179,7 +179,7 @@
>     struct savage_vtxbuf_t *vtxBuf;
> 
>     /* aperture base */
>-    GLuint apertureBase[5];
>+    GLubyte *apertureBase[5];
>     GLuint aperturePitch;
>     /* Manage hardware state */
>     GLuint dirty;
>@@ -235,8 +235,8 @@
> 
>     /* 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 */
>--- ./savage_xmesa.c.~1.43.~	2005-03-12 23:57:57.000000000 +0100
>+++ ./savage_xmesa.c	2005-04-07 22:11:31.000000000 +0200
>@@ -213,7 +213,7 @@
>        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 @@
> 
>    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;
>--- ./savagetex.c.~1.32.~	2005-03-14 23:05:17.000000000 +0100
>+++ ./savagetex.c	2005-04-07 22:06:53.000000000 +0200
>@@ -754,7 +754,7 @@
> 
>       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? */
>    }
> 
>--- ./savagestate.c.~1.31.~	2005-03-23 19:02:20.000000000 +0100
>+++ ./savagestate.c	2005-04-07 22:05:49.000000000 +0200
>@@ -1710,8 +1710,8 @@
>         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;

Actions: View | Splinter Review

Attachments on bug 2924: 2345 | 2347

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.