Merge branch 'gallium-0.1' into gallium-tex-surfaces

This commit is contained in:
Brian Paul 2008-05-20 15:30:23 -06:00
commit bf7519b0a4
1 changed files with 7 additions and 0 deletions

View File

@ -143,6 +143,12 @@ st_delete_program(GLcontext *ctx, struct gl_program *prog)
stvp->driver_shader = NULL;
}
if (stvp->draw_shader) {
/* this would only have been allocated for the RasterPos path */
draw_delete_vertex_shader(st->draw, stvp->draw_shader);
stvp->draw_shader = NULL;
}
if (stvp->state.tokens) {
FREE((void *) stvp->state.tokens);
stvp->state.tokens = NULL;
@ -226,6 +232,7 @@ static void st_program_string_notify( GLcontext *ctx,
}
if (stvp->draw_shader) {
/* this would only have been allocated for the RasterPos path */
draw_delete_vertex_shader(st->draw, stvp->draw_shader);
stvp->draw_shader = NULL;
}