radeonsi: Fix user clip planes

4 more little piglits.

NOTE: This is a candidate for the 9.1 branch.

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 4380d2ca310f5caf49125867c7ec7c55fb1cee6a..ae571a4fb54ce3fd2e465769d640828150745116 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -316,10 +316,9 @@ static bool si_update_draw_info_state(struct r600_context *rctx,
                       (rctx->queued.named.rasterizer->clip_plane_enable &
                        vs->clip_dist_write));
        si_pm4_set_reg(pm4, R_028810_PA_CL_CLIP_CNTL,
-                      rctx->queued.named.rasterizer->pa_cl_clip_cntl
-                       /*| (rctx->vs_shader->shader.clip_dist_write ||
-                       rctx->vs_shader->shader.vs_prohibit_ucps ?
-                       0 : rctx->rasterizer->clip_plane_enable & 0x3F)*/);
+                      rctx->queued.named.rasterizer->pa_cl_clip_cntl |
+                      (vs->clip_dist_write ? 0 :
+                       rctx->queued.named.rasterizer->clip_plane_enable & 0x3F));
 
        si_pm4_set_state(rctx, draw_info, pm4);
        return true;