From 1bef2b7bf524ab53d92456a0442662f80b76e30c Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Thu, 21 Dec 2017 16:30:25 +0100 Subject: [PATCH] nv50/ir/nir: implement geometry shader nir_intrinsics v4: use smarter getIndirect helper use new getSlotAddress helper use loadFrom helper v8: don't require C++11 features Signed-off-by: Karol Herbst --- .../nouveau/codegen/nv50_ir_from_nir.cpp | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp index 5b7a3303e78..991c1283a0f 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp @@ -465,6 +465,10 @@ operation Converter::getOperation(nir_intrinsic_op op) { switch (op) { + case nir_intrinsic_emit_vertex: + return OP_EMIT; + case nir_intrinsic_end_primitive: + return OP_RESTART; default: ERROR("couldn't get operation for nir_intrinsic_op %u\n", op); assert(false); @@ -1986,6 +1990,29 @@ Converter::visit(nir_intrinsic_instr *insn) } break; } + case nir_intrinsic_load_per_vertex_input: { + const DataType dType = getDType(insn); + LValues &newDefs = convert(&insn->dest); + Value *indirectVertex; + Value *indirectOffset; + uint32_t baseVertex = getIndirect(&insn->src[0], 0, indirectVertex); + uint32_t idx = getIndirect(insn, 1, 0, indirectOffset); + + Value *vtxBase = mkOp2v(OP_PFETCH, TYPE_U32, getSSA(4, FILE_ADDRESS), + mkImm(baseVertex), indirectVertex); + for (uint8_t i = 0u; i < insn->num_components; ++i) { + uint32_t address = getSlotAddress(insn, idx, i); + loadFrom(FILE_SHADER_INPUT, 0, dType, newDefs[i], address, 0, + indirectOffset, vtxBase, info->in[idx].patch); + } + break; + } + case nir_intrinsic_emit_vertex: + case nir_intrinsic_end_primitive: { + uint32_t idx = nir_intrinsic_stream_id(insn); + mkOp1(getOperation(op), TYPE_U32, NULL, mkImm(idx))->fixed = 1; + break; + } default: ERROR("unknown nir_intrinsic_op %s\n", nir_intrinsic_infos[op].name); return false; -- 2.30.2