summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_cb_program.c
diff options
context:
space:
mode:
authorZack Rusin <zack@tungstengraphics.com>2008-05-19 12:10:42 -0400
committerZack Rusin <zack@tungstengraphics.com>2008-05-19 12:10:42 -0400
commit09900df42967a0ba61e78038304fd6c54934ad0d (patch)
tree8bf72aa313a23c8554fdda5c9381cc593132722d /src/mesa/state_tracker/st_cb_program.c
parent1c624846a81b0218b4a07328f485e295432c6312 (diff)
parent59007a811de2d76ea00164e8f1cacb4a375d1458 (diff)
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
Diffstat (limited to 'src/mesa/state_tracker/st_cb_program.c')
-rw-r--r--src/mesa/state_tracker/st_cb_program.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index a293ec3f0b..b23e000a0b 100644
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -159,7 +159,9 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
}
if (stfp->bitmap_program) {
- st_delete_program(ctx, &stfp->bitmap_program->Base.Base);
+ struct gl_program *prg = &stfp->bitmap_program->Base.Base;
+ _mesa_reference_program(ctx, &prg, NULL);
+ stfp->bitmap_program = NULL;
}
st_free_translated_vertex_programs(st, stfp->vertex_programs);