diff options
| author | Brian Paul <[email protected]> | 2006-03-29 23:42:44 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-03-29 23:42:44 +0000 |
| commit | 920023240c2fc42675f318732b43bdc6f339113c (patch) | |
| tree | 280d597a601fce8fba9a2a80591ae1695dea2b7e /src/mesa | |
| parent | 62c325af3f3238ab46c1d68570ee5a3872a74603 (diff) | |
put braces around RENDER_SPAN macro when called, not when defined. Fixes -pedantic warnings in x11 driver
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 10 | ||||
| -rw-r--r-- | src/mesa/swrast/s_tritemp.h | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 056446b17b4..440bbebce5d 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -162,7 +162,7 @@ _swrast_culltriangle( GLcontext *ctx, return; \ } -#define RENDER_SPAN( span ) { \ +#define RENDER_SPAN( span ) \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@ -177,7 +177,7 @@ _swrast_culltriangle( GLcontext *ctx, span.intTex[0] += span.intTexStep[0]; \ span.intTex[1] += span.intTexStep[1]; \ } \ - rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); } + rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, span.array->rgb, NULL); #include "s_tritemp.h" @@ -213,7 +213,7 @@ _swrast_culltriangle( GLcontext *ctx, return; \ } -#define RENDER_SPAN( span ) { \ +#define RENDER_SPAN( span ) \ GLuint i; \ span.intTex[0] -= FIXED_HALF; /* off-by-one error? */ \ span.intTex[1] -= FIXED_HALF; \ @@ -238,7 +238,7 @@ _swrast_culltriangle( GLcontext *ctx, span.z += span.zStep; \ } \ rb->PutRowRGB(ctx, rb, span.end, span.x, span.y, \ - span.array->rgb, span.array->mask); } + span.array->rgb, span.array->mask); #include "s_tritemp.h" diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h index d4c9fdd7cb9..7f581561ec5 100644 --- a/src/mesa/swrast/s_tritemp.h +++ b/src/mesa/swrast/s_tritemp.h @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1159,7 +1159,9 @@ static void NAME(GLcontext *ctx, const SWvertex *v0, #ifdef INTERP_INDEX CLAMP_INTERPOLANT(index, indexStep, len); #endif - RENDER_SPAN( span ); + { + RENDER_SPAN( span ); + } } /* |