diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2013-05-02 15:39:15 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2013-05-21 17:50:13 +0200 |
| commit | d42a2df19cea097d8af2d4d5c195483ba573655e (patch) | |
| tree | ce374ac4fb074e7c703db4ce0d603b57d58e92c8 | |
| parent | e3befbca5ed9f22effcdc91c5886c86b644bc190 (diff) | |
radeonsi: Fix user clip planes
4 more little piglits.
NOTE: This is a candidate for the 9.1 branch.
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 4380d2ca310..ae571a4fb54 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -313,16 +313,15 @@ static bool si_update_draw_info_state(struct r600_context *rctx, S_02881C_VS_OUT_CCDIST0_VEC_ENA((vs->clip_dist_write & 0x0F) != 0) | S_02881C_VS_OUT_CCDIST1_VEC_ENA((vs->clip_dist_write & 0xF0) != 0) | S_02881C_VS_OUT_MISC_VEC_ENA(vs->vs_out_misc_write) | (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; } static void si_update_spi_map(struct r600_context *rctx) |