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

st/mesa: fix incorrect prev pointer in destroy_program_variants()

Browse Source
This commit is contained in:
Brian Paul
2010-12-14 14:15:20 -07:00
parent c62bb90d6a
commit a8ca30bc58
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1008,18 +1008,18 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
case GL_VERTEX_PROGRAM_ARB: case GL_VERTEX_PROGRAM_ARB:
{ {
struct st_vertex_program *stvp = (struct st_vertex_program *) program; struct st_vertex_program *stvp = (struct st_vertex_program *) program;
struct st_vp_varient *vpv, **prev = &stvp->varients; struct st_vp_varient *vpv, **prevPtr = &stvp->varients;
for (vpv = stvp->varients; vpv; ) { for (vpv = stvp->varients; vpv; ) {
struct st_vp_varient *next = vpv->next; struct st_vp_varient *next = vpv->next;
if (vpv->key.st == st) { if (vpv->key.st == st) {
/* unlink from list */ /* unlink from list */
*prev = next; *prevPtr = next;
/* destroy this variant */ /* destroy this variant */
delete_vp_varient(st, vpv); delete_vp_varient(st, vpv);
} }
else { else {
prev = &vpv; prevPtr = &vpv->next;
} }
vpv = next; vpv = next;
} }
@@ -1029,18 +1029,18 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
{ {
struct st_fragment_program *stfp = struct st_fragment_program *stfp =
(struct st_fragment_program *) program; (struct st_fragment_program *) program;
struct st_fp_varient *fpv, **prev = &stfp->varients; struct st_fp_varient *fpv, **prevPtr = &stfp->varients;
for (fpv = stfp->varients; fpv; ) { for (fpv = stfp->varients; fpv; ) {
struct st_fp_varient *next = fpv->next; struct st_fp_varient *next = fpv->next;
if (fpv->key.st == st) { if (fpv->key.st == st) {
/* unlink from list */ /* unlink from list */
*prev = next; *prevPtr = next;
/* destroy this variant */ /* destroy this variant */
delete_fp_varient(st, fpv); delete_fp_varient(st, fpv);
} }
else { else {
prev = &fpv; prevPtr = &fpv->next;
} }
fpv = next; fpv = next;
} }
@@ -1050,18 +1050,18 @@ destroy_program_variants(struct st_context *st, struct gl_program *program)
{ {
struct st_geometry_program *stgp = struct st_geometry_program *stgp =
(struct st_geometry_program *) program; (struct st_geometry_program *) program;
struct st_gp_varient *gpv, **prev = &stgp->varients; struct st_gp_varient *gpv, **prevPtr = &stgp->varients;
for (gpv = stgp->varients; gpv; ) { for (gpv = stgp->varients; gpv; ) {
struct st_gp_varient *next = gpv->next; struct st_gp_varient *next = gpv->next;
if (gpv->key.st == st) { if (gpv->key.st == st) {
/* unlink from list */ /* unlink from list */
*prev = next; *prevPtr = next;
/* destroy this variant */ /* destroy this variant */
delete_gp_varient(st, gpv); delete_gp_varient(st, gpv);
} }
else { else {
prev = &gpv; prevPtr = &gpv->next;
} }
gpv = next; gpv = next;
} }