projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600: fix warning
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_program.c
diff --git
a/src/mesa/state_tracker/st_cb_program.c
b/src/mesa/state_tracker/st_cb_program.c
index ea0fa20012ef3bfff334238df0b4af2120e0df06..4398ab28392cbb190631ef7aa156fa042527b075 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_program.c
+++ b/
src/mesa/state_tracker/st_cb_program.c
@@
-99,7
+99,7
@@
static struct gl_program *st_new_program( GLcontext *ctx,
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB: {
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB: {
- struct st_vertex_program *prog = CALLOC_STRUCT(st_vertex_program);
+ struct st_vertex_program *prog =
ST_
CALLOC_STRUCT(st_vertex_program);
prog->serialNo = SerialNo++;
prog->serialNo = SerialNo++;
@@
-111,7
+111,7
@@
static struct gl_program *st_new_program( GLcontext *ctx,
case GL_FRAGMENT_PROGRAM_ARB:
case GL_FRAGMENT_PROGRAM_NV: {
case GL_FRAGMENT_PROGRAM_ARB:
case GL_FRAGMENT_PROGRAM_NV: {
- struct st_fragment_program *prog = CALLOC_STRUCT(st_fragment_program);
+ struct st_fragment_program *prog =
ST_
CALLOC_STRUCT(st_fragment_program);
prog->serialNo = SerialNo++;
prog->serialNo = SerialNo++;
@@
-152,7
+152,7
@@
st_delete_program(GLcontext *ctx, struct gl_program *prog)
}
if (stvp->state.tokens) {
}
if (stvp->state.tokens) {
-
FREE
((void *) stvp->state.tokens);
+
_mesa_free
((void *) stvp->state.tokens);
stvp->state.tokens = NULL;
}
}
stvp->state.tokens = NULL;
}
}
@@
-167,7
+167,7
@@
st_delete_program(GLcontext *ctx, struct gl_program *prog)
}
if (stfp->state.tokens) {
}
if (stfp->state.tokens) {
-
FREE
((void *) stfp->state.tokens);
+
_mesa_free
((void *) stfp->state.tokens);
stfp->state.tokens = NULL;
}
stfp->state.tokens = NULL;
}
@@
-214,7
+214,7
@@
static void st_program_string_notify( GLcontext *ctx,
}
if (stfp->state.tokens) {
}
if (stfp->state.tokens) {
-
FREE
((void *) stfp->state.tokens);
+
_mesa_free
((void *) stfp->state.tokens);
stfp->state.tokens = NULL;
}
stfp->state.tokens = NULL;
}
@@
-242,7
+242,7
@@
static void st_program_string_notify( GLcontext *ctx,
}
if (stvp->state.tokens) {
}
if (stvp->state.tokens) {
-
FREE
((void *) stvp->state.tokens);
+
_mesa_free
((void *) stvp->state.tokens);
stvp->state.tokens = NULL;
}
stvp->state.tokens = NULL;
}