diff options
| author | Marek Olšák <[email protected]> | 2019-10-16 16:46:19 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-10-17 20:31:34 -0400 |
| commit | 48b4843c30594876f03044a518159f449802959c (patch) | |
| tree | eae1aa539810552ece903e4c778360413fe9c6d5 /src/mesa/state_tracker/st_context.c | |
| parent | e94da4ab80c189eee6adc833b6fe9bc20ada1e64 (diff) | |
st/mesa: merge st_fragment_program into st_common_program
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 549afb3168e..b54afce0d78 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -145,8 +145,8 @@ st_get_active_states(struct gl_context *ctx) 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_common_program *fp = + st_common_program(ctx->FragmentProgram._Current); struct st_common_program *cp = st_common_program(ctx->ComputeProgram._Current); uint64_t active_shader_states = 0; @@ -1041,7 +1041,7 @@ st_destroy_context(struct st_context *st) simple_mtx_destroy(&st->zombie_sampler_views.mutex); simple_mtx_destroy(&st->zombie_shaders.mutex); - st_reference_fragprog(st, &st->fp, NULL); + st_reference_prog(st, &st->fp, NULL); st_reference_prog(st, &st->gp, NULL); st_reference_vertprog(st, &st->vp, NULL); st_reference_prog(st, &st->tcp, NULL); |