diff options
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 801322622f0..d99791100a7 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -131,12 +131,12 @@ st_get_active_states(struct gl_context *ctx) { struct st_vertex_program *vp = st_vertex_program(ctx->VertexProgram._Current); - struct st_tessctrl_program *tcp = - st_tessctrl_program(ctx->TessCtrlProgram._Current); - struct st_tesseval_program *tep = - st_tesseval_program(ctx->TessEvalProgram._Current); - struct st_geometry_program *gp = - st_geometry_program(ctx->GeometryProgram._Current); + struct st_common_program *tcp = + st_common_program(ctx->TessCtrlProgram._Current); + struct st_common_program *tep = + st_common_program(ctx->TessEvalProgram._Current); + struct st_common_program *gp = + st_common_program(ctx->GeometryProgram._Current); struct st_fragment_program *fp = st_fragment_program(ctx->FragmentProgram._Current); struct st_compute_program *cp = @@ -583,10 +583,10 @@ void st_destroy_context( struct st_context *st ) _mesa_HashWalk(ctx->Shared->TexObjects, destroy_tex_sampler_cb, st); st_reference_fragprog(st, &st->fp, NULL); - st_reference_geomprog(st, &st->gp, NULL); + st_reference_prog(st, &st->gp, NULL); st_reference_vertprog(st, &st->vp, NULL); - st_reference_tesscprog(st, &st->tcp, NULL); - st_reference_tesseprog(st, &st->tep, NULL); + st_reference_prog(st, &st->tcp, NULL); + st_reference_prog(st, &st->tep, NULL); st_reference_compprog(st, &st->cp, NULL); /* release framebuffer surfaces */ |