diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-08 23:30:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-08 23:30:36 +0200 |
| commit | e16399e57caac9e859a7d28921c73ef9839b571e (patch) | |
| tree | b86ed43f749ebfe0bb3842fcd76a34e386011fcc /mesalib/src/mesa/main/atifragshader.c | |
| parent | 166caebfaa2b217332a345ffb02c5b9e52f65a3d (diff) | |
| parent | cb346e228aeb500cd61ec86644c034c238332d3b (diff) | |
| download | vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.tar.gz vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.tar.bz2 vcxsrv-e16399e57caac9e859a7d28921c73ef9839b571e.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/atifragshader.c')
| -rw-r--r-- | mesalib/src/mesa/main/atifragshader.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/atifragshader.c b/mesalib/src/mesa/main/atifragshader.c index 7077c96f1..1eab7731a 100644 --- a/mesalib/src/mesa/main/atifragshader.c +++ b/mesalib/src/mesa/main/atifragshader.c @@ -325,11 +325,11 @@ _mesa_BeginFragmentShaderATI(void) a start */ for (i = 0; i < MAX_NUM_PASSES_ATI; i++) { ctx->ATIFragmentShader.Current->Instructions[i] = - calloc(1, sizeof(struct atifs_instruction) * - (MAX_NUM_INSTRUCTIONS_PER_PASS_ATI)); + calloc(sizeof(struct atifs_instruction), + MAX_NUM_INSTRUCTIONS_PER_PASS_ATI); ctx->ATIFragmentShader.Current->SetupInst[i] = - calloc(1, sizeof(struct atifs_setupinst) * - (MAX_NUM_FRAGMENT_REGISTERS_ATI)); + calloc(sizeof(struct atifs_setupinst), + MAX_NUM_FRAGMENT_REGISTERS_ATI); } /* can't rely on calloc for initialization as it's possible to redefine a shader (?) */ |