diff options
author | Brian Paul <[email protected]> | 2010-12-14 14:15:20 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2010-12-14 14:15:22 -0700 |
commit | a8ca30bc58b73203a83799149ca9d21bcdce74b5 (patch) | |
tree | 28feb6d6405729fc90ad1fdb89338d69200c3308 | |
parent | c62bb90d6a864468fe1a717aebb9c1a9c43bf3c8 (diff) |
st/mesa: fix incorrect prev pointer in destroy_program_variants()
-rw-r--r-- | src/mesa/state_tracker/st_program.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 54f1551ebc4..bbd3cdbfacb 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1008,18 +1008,18 @@ destroy_program_variants(struct st_context *st, struct gl_program *program) case GL_VERTEX_PROGRAM_ARB: { 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; ) { struct st_vp_varient *next = vpv->next; if (vpv->key.st == st) { /* unlink from list */ - *prev = next; + *prevPtr = next; /* destroy this variant */ delete_vp_varient(st, vpv); } else { - prev = &vpv; + prevPtr = &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 *) program; - struct st_fp_varient *fpv, **prev = &stfp->varients; + struct st_fp_varient *fpv, **prevPtr = &stfp->varients; for (fpv = stfp->varients; fpv; ) { struct st_fp_varient *next = fpv->next; if (fpv->key.st == st) { /* unlink from list */ - *prev = next; + *prevPtr = next; /* destroy this variant */ delete_fp_varient(st, fpv); } else { - prev = &fpv; + prevPtr = &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 *) program; - struct st_gp_varient *gpv, **prev = &stgp->varients; + struct st_gp_varient *gpv, **prevPtr = &stgp->varients; for (gpv = stgp->varients; gpv; ) { struct st_gp_varient *next = gpv->next; if (gpv->key.st == st) { /* unlink from list */ - *prev = next; + *prevPtr = next; /* destroy this variant */ delete_gp_varient(st, gpv); } else { - prev = &gpv; + prevPtr = &gpv->next; } gpv = next; } |