[Mesa-stable] [Mesa-dev] [PATCH] ac/nir: fixup layer/viewport export for GFX9.

[Andres Gomez]

Hi Dave,

This patch landed tagged for 17.2 only. Was it, then, not nominated for
17.1 intentionally ?

Br.

On Thu, 2017-08-17 at 14:27 +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> GFX9 moved where the viewport index export goes.
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/amd/common/ac_nir_to_llvm.c | 32 +++++++++++++++++++++++++-------
>  1 file changed, 25 insertions(+), 7 deletions(-)
> 
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index 7aa7567..a17a232 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -5518,11 +5518,11 @@ handle_vs_outputs_post(struct nir_to_llvm_context *ctx,
>  		                                     ctx->nir->outputs[radeon_llvm_reg_index_soa(VARYING_SLOT_VIEWPORT, 0)], "");
>  	}
>  
> -	uint32_t mask = ((outinfo->writes_pointsize == true ? 1 : 0) |
> -			 (outinfo->writes_layer == true ? 4 : 0) |
> -			 (outinfo->writes_viewport_index == true ? 8 : 0));
> -	if (mask) {
> -		pos_args[1].enabled_channels = mask;
> +	if (outinfo->writes_pointsize ||
> +	    outinfo->writes_layer ||
> +	    outinfo->writes_viewport_index) {
> +		pos_args[1].enabled_channels = ((outinfo->writes_pointsize == true ? 1 : 0) |
> +						(outinfo->writes_layer == true ? 4 : 0));
>  		pos_args[1].valid_mask = 0;
>  		pos_args[1].done = 0;
>  		pos_args[1].target = V_008DFC_SQ_EXP_POS + 1;
> @@ -5536,8 +5536,26 @@ handle_vs_outputs_post(struct nir_to_llvm_context *ctx,
>  			pos_args[1].out[0] = psize_value;
>  		if (outinfo->writes_layer == true)
>  			pos_args[1].out[2] = layer_value;
> -		if (outinfo->writes_viewport_index == true)
> -			pos_args[1].out[3] = viewport_index_value;
> +		if (outinfo->writes_viewport_index == true) {
> +			if (ctx->options->chip_class >= GFX9) {
> +				/* GFX9 has the layer in out.z[10:0] and the viewport
> +				 * index in out.z[19:16].
> +				 */
> +				LLVMValueRef v = viewport_index_value;
> +				v = to_integer(&ctx->ac, v);
> +				v = LLVMBuildShl(ctx->builder, v,
> +						 LLVMConstInt(ctx->i32, 16, false),
> +						 "");
> +				v = LLVMBuildOr(ctx->builder, v,
> +						to_integer(&ctx->ac, pos_args[1].out[2]), "");
> +
> +				pos_args[1].out[2] = to_float(&ctx->ac, v);
> +				pos_args[1].enabled_channels |= 1 << 2;
> +			} else {
> +				pos_args[1].out[3] = viewport_index_value;
> +				pos_args[1].enabled_channels |= 1 << 3;
> +			}
> +		}
>  	}
>  	for (i = 0; i < 4; i++) {
>  		if (pos_args[i].out[0])
-- 
Br,

Andres