summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-09-01 07:47:24 -0600
committerBrian Paul <brianp@vmware.com>2012-09-01 07:47:24 -0600
commit4fdac659f800da0aa4504489f627738c83c94d66 (patch)
tree2b2fb4cb36ef6fbf81c5783bad39d37d562224e9 /src/mesa/tnl
parent33bb8c051df3f2561c7b4a5ad7abefa3fce99d37 (diff)
mesa: s/CALLOC/calloc/
v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_context.c2
-rw-r--r--src/mesa/tnl/t_vb_program.c2
-rw-r--r--src/mesa/tnl/t_vb_texgen.c2
-rw-r--r--src/mesa/tnl/t_vb_texmat.c2
-rw-r--r--src/mesa/tnl/t_vb_vertex.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index dbda7a5fc47..2b4bab6917c 100644
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -50,7 +50,7 @@ _tnl_CreateContext( struct gl_context *ctx )
/* Create the TNLcontext structure
*/
- ctx->swtnl_context = tnl = (TNLcontext *) CALLOC( sizeof(TNLcontext) );
+ ctx->swtnl_context = tnl = (TNLcontext *) calloc(1, sizeof(TNLcontext));
if (!tnl) {
return GL_FALSE;
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 74772dbbe53..9222f57dee1 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -514,7 +514,7 @@ init_vp(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
struct vp_stage_data *store;
const GLuint size = VB->Size;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = VP_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index 1b4de30f017..7f754d48e26 100644
--- a/src/mesa/tnl/t_vb_texgen.c
+++ b/src/mesa/tnl/t_vb_texgen.c
@@ -562,7 +562,7 @@ static GLboolean alloc_texgen_data( struct gl_context *ctx,
struct texgen_stage_data *store;
GLuint i;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = TEXGEN_STAGE_DATA(stage);
if (!store)
return GL_FALSE;
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index 38aa51fc496..73022b42463 100644
--- 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;
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index 26e8ae065d5..fe4f72af290 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -236,7 +236,7 @@ static GLboolean init_vertex_stage( struct gl_context *ctx,
struct vertex_stage_data *store;
GLuint size = VB->Size;
- stage->privatePtr = CALLOC(sizeof(*store));
+ stage->privatePtr = calloc(1, sizeof(*store));
store = VERTEX_STAGE_DATA(stage);
if (!store)
return GL_FALSE;