aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-03 09:54:39 +0200
committermarha <marha@users.sourceforge.net>2012-09-04 14:23:32 +0200
commitc18d12d1e36354ff32724c86ae25374d1a78607f (patch)
tree3db58d40725863f1d1145002f998a6cf0662fbf9 /mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
parent77f54d0b20cc194e708bc664740e4c0b0e13c3dd (diff)
downloadvcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.tar.gz
vcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.tar.bz2
vcxsrv-c18d12d1e36354ff32724c86ae25374d1a78607f.zip
mesa xkeyboard-config git update 3 sep 2012
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 4d99b17dd..5f056b9b1 100644
--- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/mesalib/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;
@@ -1259,9 +1259,9 @@ st_translate_mesa_program(
}
out:
- FREE(t->insn);
- FREE(t->labels);
- FREE(t->constants);
+ free(t->insn);
+ free(t->labels);
+ free(t->constants);
if (t->error) {
debug_printf("%s: translate error flag set\n", __FUNCTION__);
@@ -1278,5 +1278,5 @@ out:
void
st_free_tokens(const struct tgsi_token *tokens)
{
- FREE((void *)tokens);
+ free((void *)tokens);
}