Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / sis / sis_tris.c

diff --git a/src/mesa/drivers/dri/sis/sis_tris.c b/src/mesa/drivers/dri/sis/sis_tris.c
index 095941aea2ed7cee8e939c6f2e33e6638222a6c1..4690274c3c05f8d7f43921ff6a012bdd4e7e5629 100644 (file)
--- 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;
@@ -903,14 +904,14 @@ static void sisRenderStart( GLcontext *ctx )
 
    /* projective textures are not supported by the hardware */
    if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX0 )) {
-      if (VB->TexCoordPtr[0]->size > 2)
+      if (VB->AttribPtr[_TNL_ATTRIB_TEX0]->size > 2)
         tex_fallback = GL_TRUE;
       EMIT_ATTR(_TNL_ATTRIB_TEX0, EMIT_2F);
       AGPParseSet |= SiS_PS_HAS_UV0;
    }
    /* Will only hit tex1 on SiS300 */
    if (RENDERINPUTS_TEST( index_bitset, _TNL_ATTRIB_TEX1 )) {
-      if (VB->TexCoordPtr[1]->size > 2)
+      if (VB->AttribPtr[_TNL_ATTRIB_TEX1]->size > 2)
         tex_fallback = GL_TRUE;
       EMIT_ATTR(_TNL_ATTRIB_TEX1, EMIT_2F);
       AGPParseSet |= SiS_PS_HAS_UV1;
@@ -994,7 +995,7 @@ sisFlushPrimsLocked(sisContextPtr smesa)
         MMIO(REG_3D_PrimitiveSet, smesa->dwPrimitiveSet);
       }
       while (smesa->vb_last < smesa->vb_cur) {
-        sis_emit_func(smesa, smesa->vb_last);
+        sis_emit_func(smesa, (char *)smesa->vb_last);
         smesa->vb_last += incr;
       }
       mWait3DCmdQueue(1);