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

[Ilia Mirkin]

On Jan 19, 2018 1:28 AM, "Timothy Arceri" <tarceri at itsqueeze.com> wrote:

Fixes the following piglit test on radeonsi:

./bin/arb_enhanced_layouts-gs-stream-location-aliasing
---
 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 e88f64fb3b..a204182792 100644
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -4159,6 +4159,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,
@@ -4428,8 +4430,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, instr->const_index[0],
ctx->outputs);


Wouldn't it make sense to use the same helper as end primitive uses below?

                break;
        case nir_intrinsic_end_primitive:
                ctx->abi->emit_primitive(ctx->abi,
nir_intrinsic_stream_id(instr));
--
2.14.3

_______________________________________________
mesa-dev mailing list
mesa-dev at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180119/a1483b62/attachment.html>