Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696)

7 files changed, 41 insertions, 2 deletions

diff --git a/src/mesa/swrast/s_auxbuffer.c b/src/mesa/swrast/s_auxbuffer.c
index 05a06bde53e..5d58c106852 100644
--- a/src/mesa/swrast/s_auxbuffer.c
+++ b/src/mesa/swrast/s_auxbuffer.c
@@ -93,6 +93,7 @@ void
 _swrast_use_aux_buffer(GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit)
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   (void) buffer;
 
    switch (bufferBit) {
    case DD_AUX0_BIT:
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index 7888bb618f7..26b4f902e14 100644
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -176,6 +176,7 @@ _swrast_Clear( GLcontext *ctx, GLbitfield mask,
 	       GLint x, GLint y, GLint width, GLint height )
 {
    SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   (void) all; (void) x; (void) y; (void) width; (void) height;
 #ifdef DEBUG
    {
       const GLbitfield legalBits =
@@ -254,6 +255,7 @@ _swrast_alloc_buffers( GLframebuffer *buffer )
 void
 _swrast_DrawBuffer( GLcontext *ctx, GLenum mode )
 {
+   (void) mode;
    _swrast_use_draw_buffer(ctx);
 }
 
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 32475cf5391..a678e0b55b2 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -403,6 +403,7 @@ _swrast_validate_texture_sample( GLcontext *ctx, GLuint texUnit,
 static void
 _swrast_sleep( GLcontext *ctx, GLuint new_state )
 {
+   (void) ctx; (void) new_state;
 }
 
 
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 0627dea9ddf..46f59ef3c02 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -151,6 +151,7 @@ interpolate_colors(GLcontext *ctx, struct sw_span *span)
    const GLuint n = span->end;
    GLchan (*rgba)[4] = span->array->rgba;
    GLuint i;
+   (void) ctx;
 
    ASSERT((span->interpMask & SPAN_RGBA)  &&
 	  !(span->arrayMask & SPAN_RGBA));
@@ -211,6 +212,7 @@ interpolate_indexes(GLcontext *ctx, struct sw_span *span)
    const GLuint n = span->end;
    GLuint *indexes = span->array->index;
    GLuint i;
+   (void) ctx;
    ASSERT((span->interpMask & SPAN_INDEX)  &&
 	  !(span->arrayMask & SPAN_INDEX));
 
@@ -236,6 +238,7 @@ interpolate_indexes(GLcontext *ctx, struct sw_span *span)
 static void
 interpolate_specular(GLcontext *ctx, struct sw_span *span)
 {
+   (void) ctx;
    if (span->interpMask & SPAN_FLAT) {
       /* constant color */
       const GLchan r = FixedToChan(span->specRed);
diff --git a/src/mesa/swrast/s_tcc.c b/src/mesa/swrast/s_tcc.c
index 3d8f550ece7..550a2aabdb3 100644
--- a/src/mesa/swrast/s_tcc.c
+++ b/src/mesa/swrast/s_tcc.c
@@ -179,6 +179,10 @@ _swrast_execute_codegen_program( GLcontext *ctx,
 			 struct fp_machine *machine, const struct sw_span *span,
 			 GLuint column )
 {
+   (void) ctx;
+   (void) program; (void) maxInst;
+   (void) machine; (void) span;
+   (void) column;
    return 0;
 }
 
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 59f884c00f4..834c72c50bf 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -456,6 +456,7 @@ sample_1d_nearest(GLcontext *ctx,
 {
    const GLint width = img->Width2;  /* without border, power of two */
    GLint i;
+   (void) ctx;
 
    COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width, i);
 
@@ -486,6 +487,7 @@ sample_1d_linear(GLcontext *ctx,
    GLint i0, i1;
    GLfloat u;
    GLuint useBorderColor;
+   (void) ctx;
 
    COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width, i0, i1);
 
@@ -657,6 +659,7 @@ sample_nearest_1d( GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_1d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -673,6 +676,7 @@ sample_linear_1d( GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_1d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -774,6 +778,7 @@ sample_2d_nearest(GLcontext *ctx,
    const GLint width = img->Width2;    /* without border, power of two */
    const GLint height = img->Height2;  /* without border, power of two */
    GLint i, j;
+   (void) ctx;
 
    COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width,  i);
    COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, texcoord[1], height, j);
@@ -809,6 +814,7 @@ sample_2d_linear(GLcontext *ctx,
    GLint i0, j0, i1, j1;
    GLuint useBorderColor;
    GLfloat u, v;
+   (void) ctx;
 
    COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width,  i0, i1);
    COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapT, texcoord[1], v, height, j0, j1);
@@ -917,7 +923,9 @@ sample_2d_linear_repeat(GLcontext *ctx,
    const GLint height = img->Height2;
    GLint i0, j0, i1, j1;
    GLfloat u, v;
-
+   (void) ctx;
+   (void) tObj;
+   
    ASSERT(tObj->WrapS == GL_REPEAT);
    ASSERT(tObj->WrapT == GL_REPEAT);
    ASSERT(img->Border == 0);
@@ -1117,6 +1125,7 @@ sample_nearest_2d( GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_2d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -1133,6 +1142,7 @@ sample_linear_2d( GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_2d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -1161,6 +1171,8 @@ opt_sample_rgb_2d( GLcontext *ctx, GLuint texUnit,
    const GLint rowMask = img->Height - 1;
    const GLint shift = img->WidthLog2;
    GLuint k;
+   (void) ctx;
+   (void) texUnit;
    (void) lambda;
    ASSERT(tObj->WrapS==GL_REPEAT);
    ASSERT(tObj->WrapT==GL_REPEAT);
@@ -1201,6 +1213,8 @@ opt_sample_rgba_2d( GLcontext *ctx, GLuint texUnit,
    const GLint rowMask = img->Height - 1;
    const GLint shift = img->WidthLog2;
    GLuint i;
+   (void) ctx;
+   (void) texUnit;
    (void) lambda;
    ASSERT(tObj->WrapS==GL_REPEAT);
    ASSERT(tObj->WrapT==GL_REPEAT);
@@ -1366,6 +1380,7 @@ sample_3d_nearest(GLcontext *ctx,
    const GLint height = img->Height2;   /* without border, power of two */
    const GLint depth = img->Depth2;     /* without border, power of two */
    GLint i, j, k;
+   (void) ctx;
 
    COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapS, texcoord[0], width,  i);
    COMPUTE_NEAREST_TEXEL_LOCATION(tObj->WrapT, texcoord[1], height, j);
@@ -1400,6 +1415,7 @@ sample_3d_linear(GLcontext *ctx,
    GLint i0, j0, k0, i1, j1, k1;
    GLuint useBorderColor;
    GLfloat u, v, w;
+   (void) ctx;
 
    COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapS, texcoord[0], u, width,  i0, i1);
    COMPUTE_LINEAR_TEXEL_LOCATIONS(tObj->WrapT, texcoord[1], v, height, j0, j1);
@@ -1651,6 +1667,7 @@ sample_nearest_3d(GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_3d_nearest(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -1667,6 +1684,7 @@ sample_linear_3d( GLcontext *ctx, GLuint texUnit,
 {
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
+   (void) texUnit;
    (void) lambda;
    for (i=0;i<n;i++) {
       sample_3d_linear(ctx, tObj, image, texcoords[i], rgba[i]);
@@ -1836,6 +1854,7 @@ sample_nearest_cube(GLcontext *ctx, GLuint texUnit,
                     GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    (void) lambda;
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -1854,6 +1873,7 @@ sample_linear_cube(GLcontext *ctx, GLuint texUnit,
 		   const GLfloat lambda[], GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    (void) lambda;
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -1872,6 +1892,7 @@ sample_cube_nearest_mipmap_nearest(GLcontext *ctx, GLuint texUnit,
                                    const GLfloat lambda[], GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    ASSERT(lambda != NULL);
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -1891,6 +1912,7 @@ sample_cube_linear_mipmap_nearest(GLcontext *ctx, GLuint texUnit,
                                   const GLfloat lambda[], GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    ASSERT(lambda != NULL);
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -1910,6 +1932,7 @@ sample_cube_nearest_mipmap_linear(GLcontext *ctx, GLuint texUnit,
                                   const GLfloat lambda[], GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    ASSERT(lambda != NULL);
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -1942,6 +1965,7 @@ sample_cube_linear_mipmap_linear(GLcontext *ctx, GLuint texUnit,
                                  const GLfloat lambda[], GLchan rgba[][4])
 {
    GLuint i;
+   (void) texUnit;
    ASSERT(lambda != NULL);
    for (i = 0; i < n; i++) {
       const struct gl_texture_image **images;
@@ -2053,6 +2077,7 @@ sample_nearest_rect(GLcontext *ctx, GLuint texUnit,
    const GLint height_minus_1 = img->Height - 1;
    GLuint i;
 
+   (void) ctx;
    (void) texUnit;
    (void) lambda;
 
@@ -2108,6 +2133,7 @@ sample_linear_rect(GLcontext *ctx, GLuint texUnit,
    const GLint height_minus_1 = img->Height - 1;
    GLuint i;
 
+   (void) ctx;
    (void) texUnit;
    (void) lambda;
 
@@ -2284,6 +2310,7 @@ sample_depth_texture( GLcontext *ctx, GLuint unit,
    GLenum function;
    GLchan result;
 
+   (void) lambda;
    (void) unit;
 
    ASSERT(tObj->Image[0][tObj->BaseLevel]->Format == GL_DEPTH_COMPONENT);
@@ -3494,6 +3521,7 @@ texture_apply( const GLcontext *ctx,
    GLuint i;
    GLint Rc, Gc, Bc, Ac;
    GLenum format;
+   (void) primary_rgba;
 
    ASSERT(texUnit);
    ASSERT(texUnit->_Current);
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 5c8d1ebe294..a1a629c18d2 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -927,7 +927,7 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span,
       const GLuint *zRow = (const GLuint *)				\
          _swrast_zbuffer_address(ctx, span.x, span.y);			\
       for (i = 0; i < span.end; i++) {					\
-         if (span.z < zRow[i]) {					\
+         if ((GLuint)span.z < zRow[i]) {				\
             ctx->OcclusionResult = GL_TRUE;				\
             ctx->Occlusion.PassedCounter++;				\
          }								\