Mesa (master): nv50/ir/nir: don't emit a restart with set a stream_id
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 22 11:52:39 UTC 2020
Module: Mesa
Branch: master
Commit: 636cf22a1f457c786ee068a1c91ed1461d6d3be0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=636cf22a1f457c786ee068a1c91ed1461d6d3be0
Author: Karol Herbst <kherbst at redhat.com>
Date: Tue Jun 16 17:02:06 2020 +0200
nv50/ir/nir: don't emit a restart with set a stream_id
Signed-off-by: Karol Herbst <kherbst at redhat.com>
Tested-by: Ben Skeggs <bskeggs at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5512>
---
src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
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 40c1c526224..1638872bdf9 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -1946,12 +1946,17 @@ Converter::visit(nir_intrinsic_instr *insn)
}
break;
}
- case nir_intrinsic_emit_vertex:
+ case nir_intrinsic_emit_vertex: {
if (info->io.genUserClip > 0)
handleUserClipPlanes();
- // fallthrough
+ uint32_t idx = nir_intrinsic_stream_id(insn);
+ mkOp1(getOperation(op), TYPE_U32, NULL, mkImm(idx))->fixed = 1;
+ break;
+ }
case nir_intrinsic_end_primitive: {
uint32_t idx = nir_intrinsic_stream_id(insn);
+ if (idx)
+ break;
mkOp1(getOperation(op), TYPE_U32, NULL, mkImm(idx))->fixed = 1;
break;
}
More information about the mesa-commit
mailing list