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/s_atifragshader.c | |
| 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/s_atifragshader.c')
| -rw-r--r-- | src/mesa/swrast/s_atifragshader.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_atifragshader.c b/src/mesa/swrast/s_atifragshader.c index 5fefae6c42..e88ff19123 100644 --- a/src/mesa/swrast/s_atifragshader.c +++ b/src/mesa/swrast/s_atifragshader.c @@ -279,7 +279,7 @@ handle_sample_op(GLcontext * ctx, struct atifs_machine *machine, /* sample from unit idx using texinst->src as coords */ GLuint swizzle = texinst->swizzle; GLuint coord_source = texinst->src; - GLfloat tex_coords[4]; + GLfloat tex_coords[4] = { 0 }; if (coord_source >= GL_TEXTURE0_ARB && coord_source <= GL_TEXTURE7_ARB) { coord_source -= GL_TEXTURE0_ARB; |