Mesa (master): r600g: fix db flush breaking config state
Dave Airlie
airlied at kemper.freedesktop.org
Tue Sep 28 04:32:00 UTC 2010
Module: Mesa
Branch: master
Commit: 34dba5f05aa36baecdc655f7f94fed871006d590
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=34dba5f05aa36baecdc655f7f94fed871006d590
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 28 14:27:22 2010 +1000
r600g: fix db flush breaking config state
---
src/gallium/drivers/r600/r600_state.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 791b39a..86f9825 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);
}
More information about the mesa-commit
mailing list