diff options
| author | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-12-21 18:35:54 -0700 |
| commit | 9eb7fc6661a1d46c06cec8584b898e3e690af6fa (patch) | |
| tree | 78ed4336c613303ef02691baf4d89e7330a0f6cf /src/mesa/drivers/dri/sis | |
| parent | ae1c0a06e81b8c6f015a3b64616a5d3a989f9373 (diff) | |
| parent | b57abd3bea29e95e5dee2524c3f1be4b26017c0f (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
Diffstat (limited to 'src/mesa/drivers/dri/sis')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_clear.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_tris.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_clear.c b/src/mesa/drivers/dri/sis/sis_clear.c index 323383da62a..d358ef62dc7 100644 --- a/src/mesa/drivers/dri/sis/sis_clear.c +++ b/src/mesa/drivers/dri/sis/sis_clear.c @@ -393,7 +393,6 @@ sis_clear_z_stencil_buffer( GLcontext * ctx, GLbitfield mask, GLint x, GLint y, GLint width, GLint height ) { sisContextPtr smesa = SIS_CONTEXT(ctx); - int cmd; mWait3DCmdQueue (8); MMIO(REG_SRC_PITCH, (smesa->zFormat == SiS_ZFORMAT_Z16) ? diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c index 3cf10007b58..4690274c3c0 100644 --- a/src/mesa/drivers/dri/sis/sis_tris.c +++ b/src/mesa/drivers/dri/sis/sis_tris.c @@ -430,7 +430,8 @@ do { \ #define LOCAL_VARS(n) \ sisContextPtr smesa = SIS_CONTEXT(ctx); \ - GLuint color[n], spec[n]; \ + GLuint color[n] = { 0 }; \ + GLuint spec[n] = { 0 }; \ GLuint coloroffset = smesa->coloroffset; \ GLuint specoffset = smesa->specoffset; \ (void) color; (void) spec; (void) coloroffset; (void) specoffset; |