diff options
| author | Marek Olšák <[email protected]> | 2016-06-21 15:52:03 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-06-29 20:12:00 +0200 |
| commit | ebb9c7d7c48c78f3a50654ec6385d9065c1eb7b7 (patch) | |
| tree | 42aef39ebe4b86e28351b1448a3e6e186bff8697 /src | |
| parent | e607a6be2bd2507f704dd8f10013fe96f4b1b8da (diff) | |
radeonsi: unreference framebuffer state with set_framebuffer_state
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.h | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 633d4bb7a52..6c88fe381f4 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -43,7 +43,11 @@ static void si_destroy_context(struct pipe_context *context) struct si_context *sctx = (struct si_context *)context; int i; - si_dec_framebuffer_counters(&sctx->framebuffer.state); + /* Unreference the framebuffer normally to disable related logic + * properly. + */ + struct pipe_framebuffer_state fb = {}; + context->set_framebuffer_state(context, &fb); si_release_all_descriptors(sctx); @@ -79,7 +83,6 @@ static void si_destroy_context(struct pipe_context *context) sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_fastclear); if (sctx->custom_blend_dcc_decompress) sctx->b.b.delete_blend_state(&sctx->b.b, sctx->custom_blend_dcc_decompress); - util_unreference_framebuffer_state(&sctx->framebuffer.state); if (sctx->blitter) util_blitter_destroy(sctx->blitter); diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index cec5e84ad82..6db65be382f 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2209,7 +2209,7 @@ static void si_init_depth_surface(struct si_context *sctx, surf->depth_initialized = true; } -void si_dec_framebuffer_counters(const struct pipe_framebuffer_state *state) +static void si_dec_framebuffer_counters(const struct pipe_framebuffer_state *state) { for (int i = 0; i < state->nr_cbufs; ++i) { struct r600_surface *surf = NULL; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 9361849f781..05654bbb2e4 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -332,7 +332,6 @@ si_create_sampler_view_custom(struct pipe_context *ctx, const struct pipe_sampler_view *state, unsigned width0, unsigned height0, unsigned force_level); -void si_dec_framebuffer_counters(const struct pipe_framebuffer_state *state); /* si_state_shader.c */ bool si_update_shaders(struct si_context *sctx); |