diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 09e029fbab3..da095227c77 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 25af1e379eb..5d65c86798e 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;
 }