Mesa (master): r600g: don't use register mask for DB_RENDER_CONTROL

Marek Olšák mareko at kemper.freedesktop.org
Tue Jan 31 01:43:11 UTC 2012


Module: Mesa
Branch: master
Commit: b6233f4d2e91edf28e1e5a9a82fdab341ba7dd84
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6233f4d2e91edf28e1e5a9a82fdab341ba7dd84

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Jan 28 06:07:09 2012 +0100

r600g: don't use register mask for DB_RENDER_CONTROL

We don't set the other bits anywhere else except the other DSA states,
which are mutually-exclusive with this one.

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/r600/evergreen_state.c |    4 +---
 src/gallium/drivers/r600/r600_state.c      |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 91d894d..5aaf235 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -2492,9 +2492,7 @@ void *evergreen_create_db_flush_dsa(struct r600_pipe_context *rctx)
 				S_028000_DEPTH_COPY_ENABLE(1) |
 				S_028000_STENCIL_COPY_ENABLE(1) |
 				S_028000_COPY_CENTROID(1),
-				S_028000_DEPTH_COPY_ENABLE(1) |
-				S_028000_STENCIL_COPY_ENABLE(1) |
-				S_028000_COPY_CENTROID(1), NULL, 0);
+				0xFFFFFFFF, NULL, 0);
 	return rstate;
 }
 
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index 73d1c33..d786a2c 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -2295,9 +2295,7 @@ void *r600_create_db_flush_dsa(struct r600_pipe_context *rctx)
 				S_028D0C_DEPTH_COPY_ENABLE(1) |
 				S_028D0C_STENCIL_COPY_ENABLE(1) |
 				S_028D0C_COPY_CENTROID(1),
-				S_028D0C_DEPTH_COPY_ENABLE(1) |
-				S_028D0C_STENCIL_COPY_ENABLE(1) |
-				S_028D0C_COPY_CENTROID(1), NULL, 0);
+				0xFFFFFFFF, NULL, 0);
 	return rstate;
 }
 




More information about the mesa-commit mailing list