[Mesa-dev] [PATCH 10/20] radeonsi: fix culling if clip & cull distances are used at the same time

[Nicolai Hähnle]

On 16.11.2016 19:38, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> Fixed piglits:
> - arb_cull_distance/clip-cull-3
> - arb_cull_distance/clip-cull-4

Cc: stable for this and the previous patch?

Nicolai

> ---
>  src/gallium/drivers/radeonsi/si_state.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index 683a157..7e051a1 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -644,36 +644,37 @@ static void si_emit_clip_state(struct si_context *sctx, struct r600_atom *atom)
>  static void si_emit_clip_regs(struct si_context *sctx, struct r600_atom *atom)
>  {
>  	struct radeon_winsys_cs *cs = sctx->b.gfx.cs;
>  	struct tgsi_shader_info *info = si_get_vs_info(sctx);
>  	struct si_state_rasterizer *rs = sctx->queued.named.rasterizer;
>  	unsigned window_space =
>  	   info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION];
>  	unsigned clipdist_mask =
>  		info->writes_clipvertex ? SIX_BITS : info->clipdist_writemask;
>  	unsigned ucp_mask = clipdist_mask ? 0 : rs->clip_plane_enable & SIX_BITS;
> -	unsigned total_mask = clipdist_mask | (info->culldist_writemask << info->num_written_clipdistance);
> +	unsigned culldist_mask = info->culldist_writemask << info->num_written_clipdistance;
> +	unsigned total_mask = clipdist_mask | culldist_mask;
>
>  	radeon_set_context_reg(cs, R_02881C_PA_CL_VS_OUT_CNTL,
>  		S_02881C_USE_VTX_POINT_SIZE(info->writes_psize) |
>  		S_02881C_USE_VTX_EDGE_FLAG(info->writes_edgeflag) |
>  		S_02881C_USE_VTX_RENDER_TARGET_INDX(info->writes_layer) |
>  	        S_02881C_USE_VTX_VIEWPORT_INDX(info->writes_viewport_index) |
>  		S_02881C_VS_OUT_CCDIST0_VEC_ENA((total_mask & 0x0F) != 0) |
>  		S_02881C_VS_OUT_CCDIST1_VEC_ENA((total_mask & 0xF0) != 0) |
>  		S_02881C_VS_OUT_MISC_VEC_ENA(info->writes_psize ||
>  					    info->writes_edgeflag ||
>  					    info->writes_layer ||
>  					     info->writes_viewport_index) |
>  		S_02881C_VS_OUT_MISC_SIDE_BUS_ENA(1) |
>  		(rs->clip_plane_enable &
> -		 clipdist_mask) | (info->culldist_writemask << 8));
> +		 clipdist_mask) | (culldist_mask << 8));
>  	radeon_set_context_reg(cs, R_028810_PA_CL_CLIP_CNTL,
>  		rs->pa_cl_clip_cntl |
>  		ucp_mask |
>  		S_028810_CLIP_DISABLE(window_space));
>
>  	/* reuse needs to be set off if we write oViewport */
>  	radeon_set_context_reg(cs, R_028AB4_VGT_REUSE_OFF,
>  			       S_028AB4_REUSE_OFF(info->writes_viewport_index));
>  }
>
>