Mesa (master): gallivm/nir: end primitive for all streams.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 09da72a7408f7c6d2f3754da3583d7891952645c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09da72a7408f7c6d2f3754da3583d7891952645c

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 19 15:03:25 2020 +1000

gallivm/nir: end primitive for all streams.

Call the end primitive for all streams so it can be accounted properly

Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5555>

---

 src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
index 7da701f06d8..a363571a2cd 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c
@@ -1634,10 +1634,9 @@ end_primitive_masked(struct lp_build_nir_context * bld_base,
                                             emitted_vertices_vec,
                                             uint_bld->zero);
    mask = LLVMBuildAnd(builder, mask, emitted_mask, "");
-   if (stream_id == 0)
-      bld->gs_iface->end_primitive(bld->gs_iface, &bld->bld_base.base,
-                                   total_emitted_vertices_vec,
-                                   emitted_vertices_vec, emitted_prims_vec, mask, 0);
+   bld->gs_iface->end_primitive(bld->gs_iface, &bld->bld_base.base,
+				total_emitted_vertices_vec,
+				emitted_vertices_vec, emitted_prims_vec, mask, stream_id);
    increment_vec_ptr_by_mask(bld_base, bld->emitted_prims_vec_ptr[stream_id],
                              mask);
    clear_uint_vec_ptr_from_mask(bld_base, bld->emitted_vertices_vec_ptr[stream_id],