From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Sep 2010 04:27:22 +0000 (+1000)
Subject: r600g: fix db flush breaking config state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34dba5f05aa36baecdc655f7f94fed871006d590;p=mesa.git

r600g: fix db flush breaking config state
---

diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 791b39a001e..86f9825b526 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -662,17 +662,17 @@ static int setup_db_flush(struct r600_context *rctx, struct radeon_state *flush)
 
 	surf = rctx->framebuffer->state.framebuffer.zsbuf;
 
-	if (!surf)
-		return 0;
-		
 	radeon_state_init(flush, rscreen->rw, R600_STATE_DB_FLUSH, 0, 0);
-	rtex = (struct r600_resource_texture*)surf->texture;
-	rbuffer = &rtex->resource;
-	/* just need to the bo to the flush list */
-	radeon_ws_bo_reference(rscreen->rw, &flush->bo[0], rbuffer->bo);
-	flush->placement[0] = RADEON_GEM_DOMAIN_VRAM;
 
-	flush->nbo = 1;
+	if (surf) {
+		rtex = (struct r600_resource_texture*)surf->texture;
+		rbuffer = &rtex->resource;
+		/* just need to the bo to the flush list */
+		radeon_ws_bo_reference(rscreen->rw, &flush->bo[0], rbuffer->bo);
+		flush->placement[0] = RADEON_GEM_DOMAIN_VRAM;
+
+		flush->nbo = 1;
+	}
 	return radeon_state_pm4(flush);
 }