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

draw: Avoid mixed declarations and code. 

Do not expand LOCAL_VARS to void expression.  Otherwise, declarations
and code will be mixed when more variables are declared in FUNC_ENTER.

This fixes fdo bug #29416.
This commit is contained in:
Chia-I Wu 2010-08-06 16:57:04 +08:00
parent bec87456ed
commit d38afcd2f2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/auxiliary/draw/draw_decompose_tmp.h
View File

@ -30,7 +30,7 @@
/* these macros are optional */ /* these macros are optional */
#ifndef LOCAL_VARS #ifndef LOCAL_VARS
#define LOCAL_VARS do {} while (0) #define LOCAL_VARS
#endif #endif
#ifndef FUNC_ENTER #ifndef FUNC_ENTER
#define FUNC_ENTER do {} while (0) #define FUNC_ENTER do {} while (0)
@ -50,7 +50,7 @@ FUNC(FUNC_VARS)
{ {
unsigned idx[6], i; unsigned idx[6], i;
ushort flags; ushort flags;
LOCAL_VARS; LOCAL_VARS
FUNC_ENTER; FUNC_ENTER;

2
src/gallium/auxiliary/draw/draw_pt_decompose.h
View File

@ -2,6 +2,6 @@
char *verts = (char *) vertices; \ char *verts = (char *) vertices; \
const boolean last_vertex_last = \ const boolean last_vertex_last = \
!(draw->rasterizer->flatshade && \ !(draw->rasterizer->flatshade && \
draw->rasterizer->flatshade_first) draw->rasterizer->flatshade_first);
#include "draw_decompose_tmp.h" #include "draw_decompose_tmp.h"

2
src/gallium/auxiliary/draw/draw_pt_vcache_tmp.h
View File

@ -10,7 +10,7 @@
struct draw_context *draw = vcache->draw; \ struct draw_context *draw = vcache->draw; \
const unsigned prim = vcache->input_prim; \ const unsigned prim = vcache->input_prim; \
const boolean last_vertex_last = !(draw->rasterizer->flatshade && \ const boolean last_vertex_last = !(draw->rasterizer->flatshade && \
draw->rasterizer->flatshade_first) draw->rasterizer->flatshade_first);
#define GET_ELT(idx) (get_elt(elts, idx) + elt_bias) #define GET_ELT(idx) (get_elt(elts, idx) + elt_bias)