diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-16 09:09:51 -0800 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-16 09:09:51 -0800 |
commit | 006a526edb0f5a67679309a867a1af22d94e1687 (patch) | |
tree | 85106f01665e2f3ee455d3d334a2444ea7ac6de1 /src/mesa/tnl_dd/t_dd_tritmp.h | |
parent | 11522b74b318db9d099466ff226124c23595e8e2 (diff) | |
parent | 42d94098737bbd52ce9bdcdec36dad32e6b7a0ed (diff) |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/drivers/dri/unichrome/via_ioctl.c
src/mesa/drivers/dri/unichrome/via_screen.c
src/mesa/main/version.h
src/mesa/state_tracker/st_atom.c
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_tritmp.h')
-rw-r--r-- | src/mesa/tnl_dd/t_dd_tritmp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl_dd/t_dd_tritmp.h b/src/mesa/tnl_dd/t_dd_tritmp.h index 1ae70f4059..c3ba8514c8 100644 --- a/src/mesa/tnl_dd/t_dd_tritmp.h +++ b/src/mesa/tnl_dd/t_dd_tritmp.h @@ -132,7 +132,7 @@ static void TAG(triangle)( GLcontext *ctx, GLuint e0, GLuint e1, GLuint e2 ) struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; VERTEX *v[3]; GLfloat offset = 0; - GLfloat z[3]; + GLfloat z[3] = { 0 }; GLenum mode = GL_FILL; GLuint facing = 0; LOCAL_VARS(3); @@ -395,7 +395,7 @@ static void TAG(quadr)( GLcontext *ctx, struct vertex_buffer *VB = &TNL_CONTEXT( ctx )->vb; VERTEX *v[4]; GLfloat offset = 0; - GLfloat z[4]; + GLfloat z[4] = { 0 }; GLenum mode = GL_FILL; GLuint facing = 0; LOCAL_VARS(4); |