OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: s/CALLOC/calloc/

Browse Source 
v2: replace instances in dri/common/ dirs

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Brian Paul
2012-09-01 07:47:24 -06:00
parent 33bb8c051d
commit 4fdac659f8
19 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -248,7 +248,7 @@ intel_allocate_image(int dri_format, void *loaderPrivate)
{
__DRIimage *image;
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -333,7 +333,7 @@ intel_create_image_from_renderbuffer(__DRIcontext *context,
}
irb = intel_renderbuffer(rb);
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -440,7 +440,7 @@ intel_dup_image(__DRIimage *orig_image, void *loaderPrivate)
{
__DRIimage *image;
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -1061,7 +1061,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
}
/* Allocate the private area */
intelScreen = CALLOC(sizeof *intelScreen);
intelScreen = calloc(1, sizeof *intelScreen);
if (!intelScreen) {
fprintf(stderr, "\nERROR! Allocating private area failed\n");
return false;
@@ -1143,7 +1143,7 @@ intelAllocateBuffer(__DRIscreen *screen,
assert(attachment == __DRI_BUFFER_FRONT_LEFT ||
attachment == __DRI_BUFFER_BACK_LEFT);
intelBuffer = CALLOC(sizeof *intelBuffer);
intelBuffer = calloc(1, sizeof *intelBuffer);
if (intelBuffer == NULL)
return NULL;

2
src/mesa/drivers/dri/r200/r200_context.c
View File

@@ -235,7 +235,7 @@ GLboolean r200CreateContext( gl_api api,
assert(screen);
/* Allocate the R200 context */
rmesa = (r200ContextPtr) CALLOC( sizeof(*rmesa) );
rmesa = (r200ContextPtr) calloc(1, sizeof(*rmesa));
if ( !rmesa ) {
*error = __DRI_CTX_ERROR_NO_MEMORY;
return GL_FALSE;

4
src/mesa/drivers/dri/r200/r200_state_init.c
View File

@@ -627,8 +627,8 @@ void r200InitState( r200ContextPtr rmesa )
#define ALLOC_STATE( ATOM, CHK, SZ, NM, IDX ) \
do { \
rmesa->hw.ATOM.cmd_size = SZ; \
rmesa->hw.ATOM.cmd = (GLuint *)CALLOC(SZ * sizeof(int)); \
rmesa->hw.ATOM.lastcmd = (GLuint *)CALLOC(SZ * sizeof(int)); \
rmesa->hw.ATOM.cmd = (GLuint *) calloc(SZ, sizeof(int)); \
rmesa->hw.ATOM.lastcmd = (GLuint *) calloc(SZ, sizeof(int)); \
rmesa->hw.ATOM.name = NM; \
rmesa->hw.ATOM.idx = IDX; \
if (check_##CHK != check_never) { \

2
src/mesa/drivers/dri/radeon/radeon_context.c
View File

@@ -201,7 +201,7 @@ r100CreateContext( gl_api api,
assert(screen);
/* Allocate the Radeon context */
rmesa = (r100ContextPtr) CALLOC( sizeof(*rmesa) );
rmesa = (r100ContextPtr) calloc(1, sizeof(*rmesa));
if ( !rmesa ) {
*error = __DRI_CTX_ERROR_NO_MEMORY;
return GL_FALSE;

2
src/mesa/drivers/dri/radeon/radeon_queryobj.h
View File

@@ -42,7 +42,7 @@ void radeon_emit_queryobj(struct gl_context *ctx, struct radeon_state_atom *atom
static inline void radeon_init_query_stateobj(radeonContextPtr radeon, int SZ)
{
radeon->query.queryobj.cmd_size = (SZ);
radeon->query.queryobj.cmd = (uint32_t*)CALLOC((SZ) * sizeof(uint32_t));
radeon->query.queryobj.cmd = (uint32_t*) calloc(SZ, sizeof(uint32_t));
radeon->query.queryobj.name = "queryobj";
radeon->query.queryobj.idx = 0;
radeon->query.queryobj.check = radeon_check_query_active;

8
src/mesa/drivers/dri/radeon/radeon_screen.c
View File

@@ -212,7 +212,7 @@ radeon_create_image_from_name(__DRIscreen *screen,
if (name == 0)
return NULL;
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -275,7 +275,7 @@ radeon_create_image_from_renderbuffer(__DRIcontext *context,
}
rrb = radeon_renderbuffer(rb);
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -310,7 +310,7 @@ radeon_create_image(__DRIscreen *screen,
__DRIimage *image;
radeonScreenPtr radeonScreen = screen->driverPrivate;
image = CALLOC(sizeof *image);
image = calloc(1, sizeof *image);
if (image == NULL)
return NULL;
@@ -488,7 +488,7 @@ radeonCreateScreen2(__DRIscreen *sPriv)
uint32_t device_id = 0;
/* Allocate the private area */
screen = (radeonScreenPtr) CALLOC( sizeof(*screen) );
screen = (radeonScreenPtr) calloc(1, sizeof(*screen));
if ( !screen ) {
fprintf(stderr, "%s: Could not allocate memory for screen structure", __FUNCTION__);
fprintf(stderr, "leaving here\n");

4
src/mesa/drivers/dri/radeon/radeon_state_init.c
View File

@@ -514,8 +514,8 @@ void radeonInitState( r100ContextPtr rmesa )
#define ALLOC_STATE_IDX( ATOM, CHK, SZ, NM, FLAG, IDX ) \
do { \
rmesa->hw.ATOM.cmd_size = SZ; \
rmesa->hw.ATOM.cmd = (GLuint *)CALLOC(SZ * sizeof(int)); \
rmesa->hw.ATOM.lastcmd = (GLuint *)CALLOC(SZ * sizeof(int)); \
rmesa->hw.ATOM.cmd = (GLuint *) calloc(SZ, sizeof(int)); \
rmesa->hw.ATOM.lastcmd = (GLuint *) calloc(SZ, sizeof(int)); \
rmesa->hw.ATOM.name = NM; \
rmesa->hw.ATOM.is_tcl = FLAG; \
rmesa->hw.ATOM.check = check_##CHK; \

2
src/mesa/drivers/dri/radeon/radeon_texture.c
View File

@@ -87,7 +87,7 @@ void copy_rows(void* dst, GLuint dststride, const void* src, GLuint srcstride,
*/
struct gl_texture_image *radeonNewTextureImage(struct gl_context *ctx)
{
return CALLOC(sizeof(radeon_texture_image));
return calloc(1, sizeof(radeon_texture_image));
}

2
src/mesa/main/api_arrayelt.c
View File

@@ -1426,7 +1426,7 @@ GLboolean _ae_create_context( struct gl_context *ctx )
FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
ctx->aelt_context = CALLOC( sizeof(AEcontext) );
ctx->aelt_context = calloc(1, sizeof(AEcontext));
if (!ctx->aelt_context)
return GL_FALSE;

2
src/mesa/main/matrix.c
View File

@@ -671,7 +671,7 @@ init_matrix_stack( struct gl_matrix_stack *stack,
stack->MaxDepth = maxDepth;
stack->DirtyFlag = dirtyFlag;
/* The stack */
stack->Stack = (GLmatrix *) CALLOC(maxDepth * sizeof(GLmatrix));
stack->Stack = (GLmatrix *) calloc(maxDepth, sizeof(GLmatrix));
for (i = 0; i < maxDepth; i++) {
_math_matrix_ctr(&stack->Stack[i]);
}

6
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -4680,7 +4680,8 @@ st_translate_program(
* so we put all the translated regs in t->constants.
*/
if (proginfo->Parameters) {
t->constants = (struct ureg_src *)CALLOC(proginfo->Parameters->NumParameters * sizeof(t->constants[0]));
t->constants = (struct ureg_src *)
calloc(proginfo->Parameters->NumParameters, sizeof(t->constants[0]));
if (t->constants == NULL) {
ret = PIPE_ERROR_OUT_OF_MEMORY;
goto out;
@@ -4719,7 +4720,8 @@ st_translate_program(
/* Emit immediate values.
*/
t->immediates = (struct ureg_src *)CALLOC(program->num_immediates * sizeof(struct ureg_src));
t->immediates = (struct ureg_src *)
calloc(program->num_immediates, sizeof(struct ureg_src));
if (t->immediates == NULL) {
ret = PIPE_ERROR_OUT_OF_MEMORY;
goto out;

2
src/mesa/swrast/s_context.c
View File

@@ -720,7 +720,7 @@ GLboolean
_swrast_CreateContext( struct gl_context *ctx )
{
GLuint i;
SWcontext *swrast = (SWcontext *)CALLOC(sizeof(SWcontext));
SWcontext *swrast = (SWcontext *) calloc(1, sizeof(SWcontext));
#ifdef _OPENMP
const GLuint maxThreads = omp_get_max_threads();
#else

2
src/mesa/swrast/s_zoom.c
View File

@@ -143,7 +143,7 @@ zoom_span( struct gl_context *ctx, GLint imgX, GLint imgY, const SWspan *span,
if (!swrast->ZoomedArrays) {
/* allocate on demand */
swrast->ZoomedArrays = (SWspanarrays *) CALLOC(sizeof(SWspanarrays));
swrast->ZoomedArrays = (SWspanarrays *) calloc(1, sizeof(SWspanarrays));
if (!swrast->ZoomedArrays)
return;
}

2
src/mesa/swrast_setup/ss_context.c
View File

@@ -49,7 +49,7 @@
GLboolean
_swsetup_CreateContext( struct gl_context *ctx )
{
SScontext *swsetup = (SScontext *)CALLOC(sizeof(SScontext));
SScontext *swsetup = (SScontext *) calloc(1, sizeof(SScontext));
if (!swsetup)
return GL_FALSE;

2
src/mesa/tnl/t_context.c
View File

@@ -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;

2
src/mesa/tnl/t_vb_program.c
View File

@@ -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;

2
src/mesa/tnl/t_vb_texgen.c
View File

@@ -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;

2
src/mesa/tnl/t_vb_texmat.c
View File

@@ -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;

2
src/mesa/tnl/t_vb_vertex.c
View File

@@ -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;