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/swrast_setup/ss_tritmp.h | |
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/swrast_setup/ss_tritmp.h')
-rw-r--r-- | src/mesa/swrast_setup/ss_tritmp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast_setup/ss_tritmp.h b/src/mesa/swrast_setup/ss_tritmp.h index 724b5e94fa..bd20a8d972 100644 --- a/src/mesa/swrast_setup/ss_tritmp.h +++ b/src/mesa/swrast_setup/ss_tritmp.h @@ -41,9 +41,9 @@ static void TAG(triangle)(GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) GLenum mode = GL_FILL; GLuint facing = 0; GLchan saved_color[3][4]; - GLfloat saved_col0[3][4]; - GLfloat saved_spec[3][4]; - GLfloat saved_index[3]; + GLfloat saved_col0[3][4] = { { 0 } }; + GLfloat saved_spec[3][4] = { { 0 } }; + GLfloat saved_index[3] = { 0 }; v[0] = &verts[e0]; v[1] = &verts[e1]; |