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

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
parent 71eb108831 69fd676240
commit cf1ae676ec
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/state_tracker/st_cb_program.c
View File

@@ -89,6 +89,10 @@ 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, static struct gl_program *st_new_program( GLcontext *ctx,
GLenum target, GLenum target,
GLuint id ) GLuint id )
@@ -118,7 +122,8 @@ static struct gl_program *st_new_program( GLcontext *ctx,
} }
default: 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; uint i;
st_reference_fragprog(st, &st->fp, NULL);
st_reference_vertprog(st, &st->vp, NULL);
draw_destroy(st->draw); draw_destroy(st->draw);
st_destroy_atoms( st ); st_destroy_atoms( st );
st_destroy_draw( 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 */ /* need to unbind and destroy CSO objects before anything else */
cso_release_all(st->cso_context); 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_delete_program_cache(st->ctx, st->pixel_xfer.cache);
_mesa_free_context_data(ctx); _mesa_free_context_data(ctx);