summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-12-14 08:36:39 -0700
committerBrian Paul <brianp@vmware.com>2010-12-14 12:17:10 -0700
commit68c41a25b4adf77886cc915d47af5e01723142f8 (patch)
tree1a685f501cca984d8751fd153b70ef869af76532
parent54773415f407678eb9728ac347cc8302e2d76c74 (diff)
st/mesa: rename the varient release functions
-rw-r--r--src/mesa/state_tracker/st_cb_program.c12
-rw-r--r--src/mesa/state_tracker/st_program.c6
-rw-r--r--src/mesa/state_tracker/st_program.h6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index e55c50f209..860d5a46de 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -128,7 +128,7 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
case GL_VERTEX_PROGRAM_ARB:
{
struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
- st_vp_release_varients( st, stvp );
+ st_release_vp_varients( st, stvp );
}
break;
case MESA_GEOMETRY_PROGRAM:
@@ -136,7 +136,7 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
struct st_geometry_program *stgp =
(struct st_geometry_program *) prog;
- st_gp_release_varients(st, stgp);
+ st_release_gp_varients(st, stgp);
if (stgp->tgsi.tokens) {
st_free_tokens((void *) stgp->tgsi.tokens);
@@ -149,7 +149,7 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
struct st_fragment_program *stfp =
(struct st_fragment_program *) prog;
- st_fp_release_varients(st, stfp);
+ st_release_fp_varients(st, stfp);
if (stfp->tgsi.tokens) {
st_free_tokens(stfp->tgsi.tokens);
@@ -193,7 +193,7 @@ st_program_string_notify( struct gl_context *ctx,
if (target == GL_FRAGMENT_PROGRAM_ARB) {
struct st_fragment_program *stfp = (struct st_fragment_program *) prog;
- st_fp_release_varients(st, stfp);
+ st_release_fp_varients(st, stfp);
if (stfp->tgsi.tokens) {
st_free_tokens(stfp->tgsi.tokens);
@@ -206,7 +206,7 @@ st_program_string_notify( struct gl_context *ctx,
else if (target == MESA_GEOMETRY_PROGRAM) {
struct st_geometry_program *stgp = (struct st_geometry_program *) prog;
- st_gp_release_varients(st, stgp);
+ st_release_gp_varients(st, stgp);
if (stgp->tgsi.tokens) {
st_free_tokens((void *) stgp->tgsi.tokens);
@@ -219,7 +219,7 @@ st_program_string_notify( struct gl_context *ctx,
else if (target == GL_VERTEX_PROGRAM_ARB) {
struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
- st_vp_release_varients( st, stvp );
+ st_release_vp_varients( st, stvp );
if (st->vp == stvp)
st->dirty.st |= ST_NEW_VERTEX_PROGRAM;
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 65a5631996..54f1551ebc 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -82,7 +82,7 @@ delete_vp_varient(struct st_context *st, struct st_vp_varient *vpv)
* Clean out any old compilations:
*/
void
-st_vp_release_varients( struct st_context *st,
+st_release_vp_varients( struct st_context *st,
struct st_vertex_program *stvp )
{
struct st_vp_varient *vpv;
@@ -116,7 +116,7 @@ delete_fp_varient(struct st_context *st, struct st_fp_varient *fpv)
* Free all varients of a fragment program.
*/
void
-st_fp_release_varients(struct st_context *st, struct st_fragment_program *stfp)
+st_release_fp_varients(struct st_context *st, struct st_fragment_program *stfp)
{
struct st_fp_varient *fpv;
@@ -148,7 +148,7 @@ delete_gp_varient(struct st_context *st, struct st_gp_varient *gpv)
* Free all varients of a geometry program.
*/
void
-st_gp_release_varients(struct st_context *st, struct st_geometry_program *stgp)
+st_release_gp_varients(struct st_context *st, struct st_geometry_program *stgp)
{
struct st_gp_varient *gpv;
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 7bb4f0709a..0cf81caa26 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -278,15 +278,15 @@ st_get_gp_varient(struct st_context *st,
extern void
-st_vp_release_varients( struct st_context *st,
+st_release_vp_varients( struct st_context *st,
struct st_vertex_program *stvp );
extern void
-st_fp_release_varients( struct st_context *st,
+st_release_fp_varients( struct st_context *st,
struct st_fragment_program *stfp );
extern void
-st_gp_release_varients(struct st_context *st,
+st_release_gp_varients(struct st_context *st,
struct st_geometry_program *stgp);