OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: rename the varient release functions

Browse Source
This commit is contained in:
Brian Paul
2010-12-14 08:36:39 -07:00
parent 54773415f4
commit 68c41a25b4
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/state_tracker/st_cb_program.c
View File

@@ -128,7 +128,7 @@ st_delete_program(struct gl_context *ctx, struct gl_program *prog)
case GL_VERTEX_PROGRAM_ARB: case GL_VERTEX_PROGRAM_ARB:
{ {
struct st_vertex_program *stvp = (struct st_vertex_program *) prog; struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
st_vp_release_varients( st, stvp ); st_release_vp_varients( st, stvp );
} }
break; break;
case MESA_GEOMETRY_PROGRAM: 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 *stgp =
(struct st_geometry_program *) prog; (struct st_geometry_program *) prog;
st_gp_release_varients(st, stgp); st_release_gp_varients(st, stgp);
if (stgp->tgsi.tokens) { if (stgp->tgsi.tokens) {
st_free_tokens((void *) 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 *stfp =
(struct st_fragment_program *) prog; (struct st_fragment_program *) prog;
st_fp_release_varients(st, stfp); st_release_fp_varients(st, stfp);
if (stfp->tgsi.tokens) { if (stfp->tgsi.tokens) {
st_free_tokens(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) { if (target == GL_FRAGMENT_PROGRAM_ARB) {
struct st_fragment_program *stfp = (struct st_fragment_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) { if (stfp->tgsi.tokens) {
st_free_tokens(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) { else if (target == MESA_GEOMETRY_PROGRAM) {
struct st_geometry_program *stgp = (struct st_geometry_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) { if (stgp->tgsi.tokens) {
st_free_tokens((void *) 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) { else if (target == GL_VERTEX_PROGRAM_ARB) {
struct st_vertex_program *stvp = (struct st_vertex_program *) prog; 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) if (st->vp == stvp)
st->dirty.st |= ST_NEW_VERTEX_PROGRAM; st->dirty.st |= ST_NEW_VERTEX_PROGRAM;

6
src/mesa/state_tracker/st_program.c
View File

@@ -82,7 +82,7 @@ delete_vp_varient(struct st_context *st, struct st_vp_varient *vpv)
* Clean out any old compilations: * Clean out any old compilations:
*/ */
void void
st_vp_release_varients( struct st_context *st, st_release_vp_varients( struct st_context *st,
struct st_vertex_program *stvp ) struct st_vertex_program *stvp )
{ {
struct st_vp_varient *vpv; 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. * Free all varients of a fragment program.
*/ */
void 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; 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. * Free all varients of a geometry program.
*/ */
void 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; struct st_gp_varient *gpv;

6
src/mesa/state_tracker/st_program.h
View File

@@ -278,15 +278,15 @@ st_get_gp_varient(struct st_context *st,
extern void extern void
st_vp_release_varients( struct st_context *st, st_release_vp_varients( struct st_context *st,
struct st_vertex_program *stvp ); struct st_vertex_program *stvp );
extern void extern void
st_fp_release_varients( struct st_context *st, st_release_fp_varients( struct st_context *st,
struct st_fragment_program *stfp ); struct st_fragment_program *stfp );
extern void extern void
st_gp_release_varients(struct st_context *st, st_release_gp_varients(struct st_context *st,
struct st_geometry_program *stgp); struct st_geometry_program *stgp);