diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
| commit | 11522b74b318db9d099466ff226124c23595e8e2 (patch) | |
| tree | 2f57b1d594a9f6c223b002f1c549ea5f799b37cc /src/mesa/drivers/dri/i810 | |
| parent | b90f7f3ad324b1e4c39e334cdeb9556c3eb808ab (diff) | |
| parent | f23d01e726a57cd6b8e31f1049ee5853773df7ea (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
Diffstat (limited to 'src/mesa/drivers/dri/i810')
| -rw-r--r-- | src/mesa/drivers/dri/i810/i810tris.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i810/i810tris.c b/src/mesa/drivers/dri/i810/i810tris.c index b508496fb6..213ba541ce 100644 --- a/src/mesa/drivers/dri/i810/i810tris.c +++ b/src/mesa/drivers/dri/i810/i810tris.c @@ -270,7 +270,8 @@ do { \ #define LOCAL_VARS(n) \ i810ContextPtr imesa = I810_CONTEXT(ctx); \ - GLuint color[n], spec[n]; \ + GLuint color[n] = { 0 }; \ + GLuint spec[n] = { 0 }; \ GLuint coloroffset = (imesa->vertex_size == 4 ? 3 : 4); \ GLboolean havespec = (imesa->vertex_size > 4); \ (void) color; (void) spec; (void) coloroffset; (void) havespec; |