swrast: fix assorted bugs in software blit code

[mesa.git] / src / mesa / tnl / t_vb_texmat.c

diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index 38aa51fc496abf2f15d9ebb1bdf14f72f942cf76..91bb0f7978fb1c87f7aaa32eec27781722ccdb6e 100644 (file)
--- a/src/mesa/tnl/t_vb_texmat.c
+++ b/src/mesa/tnl/t_vb_texmat.c
@@ -89,7 +89,7 @@ static GLboolean alloc_texmat_data( struct gl_context *ctx,
    struct texmat_stage_data *store;
    GLuint i;
 
-   stage->privatePtr = CALLOC(sizeof(*store));
+   stage->privatePtr = calloc(1, sizeof(*store));
    store = TEXMAT_STAGE_DATA(stage);
    if (!store)
       return GL_FALSE;
@@ -110,7 +110,7 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage )
       for (i = 0; i < MAX_TEXTURE_COORD_UNITS; i++)
         if (store->texcoord[i].data)
            _mesa_vector4f_free( &store->texcoord[i] );
-      FREE( store );
+      free( store );
       stage->privatePtr = NULL;
    }
 }