AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silence warnings

Browse Source
This commit is contained in:
Alan Hourihane
2004-12-02 14:50:13 +00:00
parent 8694285053
commit 025aa9efcd
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r200/r200_tcl.c
+13 -8
View File
@@ -177,11 +177,11 @@ while (0)
* discrete and there are no intervening state changes. (Somewhat
* duplicates changes to DrawArrays code)
*/
static void EMIT_PRIM( GLcontext *ctx,
GLenum prim,
GLuint hwprim,
GLuint start,
GLuint count)
static void r200EmitPrim( GLcontext *ctx,
GLenum prim,
GLuint hwprim,
GLuint start,
GLuint count)
{
r200ContextPtr rmesa = R200_CONTEXT( ctx );
r200TclPrimitive( ctx, prim, hwprim );
@@ -201,7 +201,9 @@ static void EMIT_PRIM( GLcontext *ctx,
count - start );
}
#define EMIT_PRIM(ctx, prim, hwprim, start, count) do { \
r200EmitPrim( ctx, prim, hwprim, start, count ); \
(void) rmesa; } while (0)
/* Try & join small primitives
*/
@@ -221,9 +223,12 @@ static void EMIT_PRIM( GLcontext *ctx,
#define EMIT_ELT(dest, offset, x) do { \
int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 ); \
GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 ); \
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
#define EMIT_ELT(dest, offset, x) (dest)[offset] = (GLushort) (x)
#define EMIT_ELT(dest, offset, x) do { \
(dest)[offset] = (GLushort) (x); \
(void)rmesa; } while (0)
#endif
#define EMIT_TWO_ELTS(dest, offset, x, y) *(GLuint *)((dest)+offset) = ((y)<<16)|(x);
src/mesa/drivers/dri/radeon/radeon_swtcl.c
+5 -2
View File
@@ -564,9 +564,12 @@ static void *radeon_alloc_elts( radeonContextPtr rmesa, int nr )
#define EMIT_ELT(offset, x) do { \
int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 ); \
GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 ); \
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
#define EMIT_ELT(offset, x) (dest)[offset] = (GLushort) (x)
#define EMIT_ELT(offset, x) do { \
(dest)[offset] = (GLushort) (x); \
(void)rmesa; } while (0)
#endif
#define EMIT_TWO_ELTS(offset, x, y) *(GLuint *)(dest+offset) = ((y)<<16)|(x);
#define INCR_ELTS( nr ) dest += nr
src/mesa/drivers/dri/radeon/radeon_tcl.c
+9 -4
View File
@@ -169,7 +169,7 @@ static GLushort *radeonAllocElts( radeonContextPtr rmesa, GLuint nr )
* discrete and there are no intervening state changes. (Somewhat
* duplicates changes to DrawArrays code)
*/
static void EMIT_PRIM( GLcontext *ctx,
static void radeonEmitPrim( GLcontext *ctx,
GLenum prim,
GLuint hwprim,
GLuint start,
@@ -194,7 +194,9 @@ static void EMIT_PRIM( GLcontext *ctx,
count - start );
}
#define EMIT_PRIM( ctx, prim, hwprim, start, count ) do { \
radeonEmitPrim( ctx, prim, hwprim, start, count ); \
(void) rmesa; } while (0)
/* Try & join small primitives
*/
@@ -214,9 +216,12 @@ static void EMIT_PRIM( GLcontext *ctx,
#define EMIT_ELT(dest, offset, x) do { \
int off = offset + ( ( (GLuint)dest & 0x2 ) >> 1 ); \
GLushort *des = (GLushort *)( (GLuint)dest & ~0x2 ); \
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); } while (0)
(des)[ off + 1 - 2 * ( off & 1 ) ] = (GLushort)(x); \
(void)rmesa; } while (0)
#else
#define EMIT_ELT(dest, offset, x) (dest)[offset] = (GLushort) (x)
#define EMIT_ELT(dest, offset, x) do { \
(dest)[offset] = (GLushort) (x); \
(void)rmesa; } while (0)
#endif
#define EMIT_TWO_ELTS(dest, offset, x, y) *(GLuint *)(dest+offset) = ((y)<<16)|(x);
src/mesa/drivers/x11/xm_tri.c
-4
View File
@@ -1351,7 +1351,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
USE(smooth_DITHER8_z_triangle);
else
USE(smooth_DITHER_z_triangle);
break;
case PF_Lookup:
if (depth == 8)
USE(smooth_LOOKUP8_z_triangle);
@@ -1389,7 +1388,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
USE(flat_DITHER8_z_triangle);
else
USE(flat_DITHER_z_triangle);
break;
case PF_Lookup:
if (depth == 8)
USE(flat_LOOKUP8_z_triangle);
@@ -1424,7 +1422,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
USE(smooth_DITHER8_triangle);
else
USE(smooth_DITHER_triangle);
break;
case PF_Lookup:
if (depth == 8)
USE(smooth_LOOKUP8_triangle);
@@ -1460,7 +1457,6 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx )
USE(flat_DITHER8_triangle);
else
USE(flat_DITHER_triangle);
break;
case PF_Lookup:
if (depth == 8)
USE(flat_LOOKUP8_triangle);