fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-13 17:30:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Brian Paul 2008-05-20 14:38:45 -06:00
commit cf1ae676ec
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/state_tracker/st_cb_program.c
View file

@ -89,8 +89,12 @@ static void st_use_program( GLcontext *ctx,
/**
* Called via ctx->Driver.NewProgram() to allocate a new vertex or
* fragment program.
*/
static struct gl_program *st_new_program( GLcontext *ctx,
GLenum target,
GLenum target,
GLuint id )
{
switch (target) {
@ -118,7 +122,8 @@ static struct gl_program *st_new_program( GLcontext *ctx,
}
default:
return _mesa_new_program(ctx, target, id);
assert(0);
return NULL;
}
}

6
src/mesa/state_tracker/st_context.c
View file

@ -158,9 +158,6 @@ static void st_destroy_context_priv( struct st_context *st )
{
uint i;
st_reference_fragprog(st, &st->fp, NULL);
st_reference_vertprog(st, &st->vp, NULL);
draw_destroy(st->draw);
st_destroy_atoms( st );
st_destroy_draw( st );
@ -195,6 +192,9 @@ void st_destroy_context( struct st_context *st )
/* need to unbind and destroy CSO objects before anything else */
cso_release_all(st->cso_context);
st_reference_fragprog(st, &st->fp, NULL);
st_reference_vertprog(st, &st->vp, NULL);
_mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);
_mesa_free_context_data(ctx);