Module Name: xsrc
Committed By: riastradh
Date: Wed Jul 9 20:05:37 UTC 2014
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: r200_tcl.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon:
radeon_tcl.c
Log Message:
Cast pointers to uintptr_t, not random integer types.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.6 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.7
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c:1.6 Wed Jul 9 19:46:48 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200/r200_tcl.c Wed Jul 9 20:05:37 2014
@@ -219,8 +219,8 @@ static void r200EmitPrim( struct gl_cont
#ifdef MESA_BIG_ENDIAN
/* We could do without (most of) this ugliness if dest was always 32 bit word aligned... */
#define EMIT_ELT(dest, offset, x) do { \
- int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 ); \
- GLushort *des = (GLushort *)( (unsigned long)dest & ~0x2 ); \
+ int off = offset + ( ( (uintptr_t)dest & 0x2 ) >> 1 ); \
+ GLushort *des = (GLushort *)( (uintptr_t)dest & ~0x2 ); \
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
Index: xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.1.1.5 xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c:1.1.1.5 Wed Jul 9 19:38:55 2014
+++ xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon/radeon_tcl.c Wed Jul 9 20:05:37 2014
@@ -207,8 +207,8 @@ static void radeonEmitPrim( struct gl_co
#ifdef MESA_BIG_ENDIAN
/* We could do without (most of) this ugliness if dest was always 32 bit word aligned... */
#define EMIT_ELT(dest, offset, x) do { \
- int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 ); \
- GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 ); \
+ int off = offset + ( ( (uintptr_t)dest & 0x2 ) >> 1 ); \
+ GLushort *des = (GLushort *)( (uintptr_t)dest & ~0x2 ); \
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
