savage: Silence compiler warnings.
authorVinson Lee <vlee@vmware.com>
Wed, 16 Dec 2009 00:32:51 +0000 (16:32 -0800)
committerVinson Lee <vlee@vmware.com>
Wed, 16 Dec 2009 00:32:51 +0000 (16:32 -0800)
src/mesa/drivers/dri/savage/savage_xmesa.c
src/mesa/drivers/dri/savage/savageioctl.c
src/mesa/drivers/dri/savage/savagetris.c

index 931ceff0a81c65f002eec8a2d9bc8fd2b1bb0f4f..048fbe452c2cd9a419adb3fcaa2119c9bfa15182 100644 (file)
@@ -436,7 +436,7 @@ savageCreateContext( const __GLcontextModes *mesaVis,
    if (ctx->Const.MaxTextureLevels <= 6) { /*spec requires at least 64x64*/
        __driUtilMessage("Not enough texture memory. "
                        "Falling back to indirect rendering.");
-       Xfree(imesa);
+       _mesa_free(imesa);
        return GL_FALSE;
    }
 
@@ -574,7 +574,7 @@ savageDestroyContext(__DRIcontextPrivate *driContextPriv)
       _mesa_destroy_context(imesa->glCtx);
 
       /* no longer use vertex_dma_buf*/
-      Xfree(imesa);
+      _mesa_free(imesa);
    }
 }
 
index 948ed18419e457ed6a38877174de210001bf124a..77ab8d16e0a40f2f5d19b9c96c8c936c9ab06620 100644 (file)
@@ -337,6 +337,8 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask )
    GLint ch = ctx->DrawBuffer->_Ymax - cy;
 
    /* XXX FIX ME: the cx,cy,cw,ch vars are currently ignored! */
+   (void) ch;
+   (void) cw;
 
    if (SAVAGE_DEBUG & DEBUG_VERBOSE_MSG)
        fprintf (stderr, "%s\n", __FUNCTION__);
index c04763b40e1c0383f3a54821b9c7367ab0ecc90f..0714101dc05abf229e67ee97ed5897bb79d3a60c 100644 (file)
@@ -435,7 +435,8 @@ do {                                                                \
 
 #define LOCAL_VARS(n)                                          \
    savageContextPtr imesa = SAVAGE_CONTEXT(ctx);               \
-   GLuint color[n], spec[n];                                   \
+   GLuint color[n] = { 0 };                                    \
+   GLuint spec[n] = { 0 };                                     \
    GLuint coloroffset =                                                \
       ((imesa->skip & SAVAGE_SKIP_W) ? 3 : 4);                 \
    GLboolean specoffset =                                      \