st/mesa: rename the varient release functions

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index e55c50f20901bb96205c8e810aa43ae93b7fc94a..860d5a46de845db69fcfd55f8438a044ee614f2d 100644 (file)
--- 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 65a56319964cfa28eeebc6042e7c70dc551c01a5..54f1551ebc496073215ff1a37ed216f7a1e56e31 100644 (file)
--- 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 7bb4f0709a6889c6efc28d11932487420d402631..0cf81caa267939a2e8f5729b051209c17cf6a68e 100644 (file)
--- 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);