From ebb9c7d7c48c78f3a50654ec6385d9065c1eb7b7 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 21 Jun 2016 15:52:03 +0200 Subject: radeonsi: unreference framebuffer state with set_framebuffer_state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_pipe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/radeonsi/si_pipe.c') 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); -- cgit v1.2.3