diff options
| author | Brian Paul <[email protected]> | 2012-08-30 16:12:53 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-08-31 08:05:38 -0600 |
| commit | 43ed822a50db6b980041ddf91c16c7f8fccc4092 (patch) | |
| tree | ce97cf56998dbeaacb374f248d09b2cf9cd32d2a /src/mesa/state_tracker | |
| parent | c5f9cf8232952388db23ece3c712e6111328a69e (diff) | |
st/mesa: s/CALLOC/calloc/ to fix allocation bug
The CALLOC() macro only takes one argument so this was being treated
as a comma expression. Simply use calloc() instead.
A follow-on patch will replace all CALLOC() calls with calloc().
NOTE: This is a candidate for the 8.0 and 9.0 branches.
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c index 4d99b17ddfa..56047141415 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -1198,7 +1198,7 @@ st_translate_mesa_program( * for these, so we put all the translated regs in t->constants. */ if (program->Parameters) { - t->constants = CALLOC( program->Parameters->NumParameters, + t->constants = calloc( program->Parameters->NumParameters, sizeof t->constants[0] ); if (t->constants == NULL) { ret = PIPE_ERROR_OUT_OF_MEMORY; |