[Mesa-dev] [PATCH v2] ac: fix emit vertex stream parameter

[Nicolai Hähnle]

On 20.01.2018 02:38, Timothy Arceri wrote:
> Fixes the following piglit test on radeonsi:
> 
> ./bin/arb_enhanced_layouts-gs-stream-location-aliasing

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>


> ---
>   src/amd/common/ac_nir_to_llvm.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
> index 3741b74dc5..781e4a905b 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -4160,6 +4160,8 @@ visit_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVMValueRef *addr
>   	int idx;
>   	struct nir_to_llvm_context *ctx = nir_to_llvm_context_from_abi(abi);
>   
> +	assert(stream == 0);
> +
>   	/* Write vertex attribute values to GSVS ring */
>   	gs_next_vertex = LLVMBuildLoad(ctx->builder,
>   				       ctx->gs_next_vertex,
> @@ -4429,8 +4431,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
>   		result = visit_interp(ctx, instr);
>   		break;
>   	case nir_intrinsic_emit_vertex:
> -		assert(instr->const_index[0] == 0);
> -		ctx->abi->emit_vertex(ctx->abi, 0, ctx->outputs);
> +		ctx->abi->emit_vertex(ctx->abi, nir_intrinsic_stream_id(instr), ctx->outputs);
>   		break;
>   	case nir_intrinsic_end_primitive:
>   		ctx->abi->emit_primitive(ctx->abi, nir_intrinsic_stream_id(instr));
> 


-- 
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.