diff options
| author | Dave Airlie <[email protected]> | 2020-06-19 15:02:25 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-07-08 06:06:05 +1000 |
| commit | 21b903dd7d9df64d175ef216e580b419d74cee1e (patch) | |
| tree | 9a9c72fee2d6f44e0bf7d7901877f60843216a6c | |
| parent | 87a388fb29c35af9ecab9fa6eb98c7ee25306ec0 (diff) | |
gallivm/gs_iface: pass stream into end primitive interface.
This is just an API change for now
Reviewed-by: Roland Scheidegger <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5555>
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi.h | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/swr_shader.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 529b1b7f0c3..49abd6434c7 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -1828,7 +1828,7 @@ draw_gs_llvm_end_primitive(const struct lp_build_gs_iface *gs_base, LLVMValueRef total_emitted_vertices_vec_ptr, LLVMValueRef verts_per_prim_vec, LLVMValueRef emitted_prims_vec, - LLVMValueRef mask_vec) + LLVMValueRef mask_vec, unsigned stream) { const struct draw_gs_llvm_iface *gs_iface = draw_gs_llvm_iface(gs_base); struct draw_gs_llvm_variant *variant = gs_iface->variant; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index c6119c509f8..a8b7d0dd86e 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -1633,7 +1633,7 @@ end_primitive_masked(struct lp_build_nir_context * bld_base, 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); + emitted_vertices_vec, emitted_prims_vec, mask, 0); 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], diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h index 4333e6d8e94..42a01ec6a77 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h @@ -435,7 +435,7 @@ struct lp_build_gs_iface LLVMValueRef total_emitted_vertices_vec, LLVMValueRef verts_per_prim_vec, LLVMValueRef emitted_prims_vec, - LLVMValueRef mask_vec); + LLVMValueRef mask_vec, unsigned stream); void (*gs_epilogue)(const struct lp_build_gs_iface *gs_iface, LLVMValueRef total_emitted_vertices_vec, LLVMValueRef emitted_prims_vec, unsigned stream); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index f61d05fded7..9e00726b35d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -4014,7 +4014,7 @@ end_primitive_masked(struct lp_build_tgsi_context * bld_base, total_emitted_vertices_vec, emitted_vertices_vec, emitted_prims_vec, - mask_vec(bld_base)); + mask_vec(bld_base), 0); #if DUMP_GS_EMITS lp_build_print_value(bld->bld_base.base.gallivm, diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp index ab8b00a5d96..ea3701346aa 100644 --- a/src/gallium/drivers/swr/swr_shader.cpp +++ b/src/gallium/drivers/swr/swr_shader.cpp @@ -520,7 +520,7 @@ swr_gs_llvm_end_primitive(const struct lp_build_gs_iface *gs_base, LLVMValueRef total_emitted_vertices_vec_ptr, LLVMValueRef verts_per_prim_vec, LLVMValueRef emitted_prims_vec, - LLVMValueRef mask_vec) + LLVMValueRef mask_vec, unsigned stream_id) { swr_gs_llvm_iface *iface = (swr_gs_llvm_iface*)gs_base; |