diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-02 13:29:40 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-12-02 13:29:40 +0000 |
| commit | 22ae633d1ea636e0e07ba044a0f8fa2195c83bc6 (patch) | |
| tree | 3b3bb53b6b73cffb24b6be0de28b4bd57d08c671 /src/mesa/swrast | |
| parent | ba807fbe2914cf1135297428f7a3163707203073 (diff) | |
Fix some warnings
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_alphabuf.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_linetemp.h | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texture.c | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/swrast/s_alphabuf.c b/src/mesa/swrast/s_alphabuf.c index 736ff2d739..5d8107c2d6 100644 --- a/src/mesa/swrast/s_alphabuf.c +++ b/src/mesa/swrast/s_alphabuf.c @@ -178,16 +178,12 @@ GLchan *get_alpha_buffer( GLcontext *ctx ) switch (swrast->CurrentBufferBit) { case DD_FRONT_LEFT_BIT: return ctx->DrawBuffer->FrontLeftAlpha; - break; case DD_BACK_LEFT_BIT: return ctx->DrawBuffer->BackLeftAlpha; - break; case DD_FRONT_RIGHT_BIT: return ctx->DrawBuffer->FrontRightAlpha; - break; case DD_BACK_RIGHT_BIT: return ctx->DrawBuffer->BackRightAlpha; - break; default: _mesa_problem(ctx, "Bad CurrentBuffer in get_alpha_buffer()"); return (GLchan *) ctx->DrawBuffer->FrontLeftAlpha; diff --git a/src/mesa/swrast/s_linetemp.h b/src/mesa/swrast/s_linetemp.h index 77c985455d..5d9591d83f 100644 --- a/src/mesa/swrast/s_linetemp.h +++ b/src/mesa/swrast/s_linetemp.h @@ -425,6 +425,8 @@ NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 ) RENDER_SPAN( span ); #endif + (void)span; + } diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index 4cb84d12f5..213971667a 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -2727,7 +2727,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx, ASSERT(t->MinFilter == GL_NEAREST); return &sample_nearest_1d; } - break; case GL_TEXTURE_2D: if (format == GL_DEPTH_COMPONENT) { return &sample_depth_texture; @@ -2759,7 +2758,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx, return &sample_nearest_2d; } } - break; case GL_TEXTURE_3D: if (needLambda) { return &sample_lambda_3d; @@ -2771,7 +2769,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx, ASSERT(t->MinFilter == GL_NEAREST); return &sample_nearest_3d; } - break; case GL_TEXTURE_CUBE_MAP: if (needLambda) { return &sample_lambda_cube; @@ -2783,7 +2780,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx, ASSERT(t->MinFilter == GL_NEAREST); return &sample_nearest_cube; } - break; case GL_TEXTURE_RECTANGLE_NV: if (needLambda) { return &sample_lambda_rect; @@ -2795,7 +2791,6 @@ _swrast_choose_texture_sample_func( GLcontext *ctx, ASSERT(t->MinFilter == GL_NEAREST); return &sample_nearest_rect; } - break; default: _mesa_problem(ctx, "invalid target in _swrast_choose_texture_sample_func"); |