Mesa (master): r600g: set full register mask for PA_CL_CLIP_CNTL

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


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Jan 29 06:04:14 2012 +0100

r600g: set full register mask for PA_CL_CLIP_CNTL

We don't set the other bits anywhere else.

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 09e029f..da09522 100644
--- a/src/gallium/drivers/r600/evergreen_state.c
+++ b/src/gallium/drivers/r600/evergreen_state.c
@@ -984,9 +984,7 @@ static void *evergreen_create_rs_state(struct pipe_context *ctx,
 			S_028810_PS_UCP_MODE(3) | S_028810_ZCLIP_NEAR_DISABLE(!state->depth_clip) |
 			S_028810_ZCLIP_FAR_DISABLE(!state->depth_clip) |
 			S_028810_DX_LINEAR_ATTR_CLIP_ENA(1),
-			~(C_028810_PS_UCP_MODE & C_028810_ZCLIP_NEAR_DISABLE &
-			C_028810_ZCLIP_FAR_DISABLE &
-			C_028810_DX_LINEAR_ATTR_CLIP_ENA), 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 25af1e3..5d65c86 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -1030,9 +1030,7 @@ static void *r600_create_rs_state(struct pipe_context *ctx,
 			S_028810_PS_UCP_MODE(3) | S_028810_ZCLIP_NEAR_DISABLE(!state->depth_clip) |
 			S_028810_ZCLIP_FAR_DISABLE(!state->depth_clip) |
 			S_028810_DX_LINEAR_ATTR_CLIP_ENA(1),
-			~(C_028810_PS_UCP_MODE & C_028810_ZCLIP_NEAR_DISABLE &
-			C_028810_ZCLIP_FAR_DISABLE &
-			C_028810_DX_LINEAR_ATTR_CLIP_ENA), NULL, 0);
+			0xFFFFFFFF, NULL, 0);
 	return rstate;
 }
 




More information about the mesa-commit mailing list