From: Dave Airlie <airlied@redhat.com>
Date: Mon, 20 Sep 2010 00:44:44 +0000 (+1000)
Subject: r600g: clean up valgrind issues on maxtargets test.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=040411de267bd6b0d82a621430cbbbb943fd455a;p=mesa.git

r600g: clean up valgrind issues on maxtargets test.
---

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index e347943873c..2b97c2a94e3 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -382,10 +382,16 @@ static void r600_set_framebuffer_state(struct pipe_context *ctx,
 	struct r600_context_state *rstate;
 	int i;
 
-	r600_context_state_decref(rctx->framebuffer);
+	if (rctx->framebuffer) {
+		for (i = 0; i < rctx->framebuffer->state.framebuffer.nr_cbufs; i++)
+			radeon_draw_unbind(&rctx->draw, &rctx->framebuffer->rstate[i+1]);
+		radeon_draw_unbind(&rctx->draw, &rctx->framebuffer->rstate[0]);
+	}
 	clean_flush(rctx, &rctx->hw_states.cb_flush);
 	clean_flush(rctx, &rctx->hw_states.db_flush);
 
+	r600_context_state_decref(rctx->framebuffer);
+
 	rstate = r600_new_context_state(pipe_framebuffer_type);
 	rstate->state.framebuffer = *state;
 	for (i = 0; i < rstate->state.framebuffer.nr_cbufs; i++) {