From 8583fcd8f182a290f000cb303ec2e067688363b8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 23 Jan 2020 16:15:50 +1000 Subject: [PATCH] gallivm/nir: add support for multiple vertex streams This adds support to the nir shader build for multiple vertex streams we store separate stats for each stream, then write them out in the epilogue. Reviewed-by: Roland Scheidegger Part-of: --- src/gallium/auxiliary/gallivm/lp_bld_nir.h | 6 +- .../auxiliary/gallivm/lp_bld_nir_soa.c | 62 ++++++++++--------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.h b/src/gallium/auxiliary/gallivm/lp_bld_nir.h index ad56fef44a0..f3987fd10b7 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.h +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.h @@ -203,9 +203,9 @@ struct lp_build_nir_soa_context const struct lp_build_image_soa *image; const struct lp_build_gs_iface *gs_iface; - LLVMValueRef emitted_prims_vec_ptr; - LLVMValueRef total_emitted_vertices_vec_ptr; - LLVMValueRef emitted_vertices_vec_ptr; + LLVMValueRef emitted_prims_vec_ptr[PIPE_MAX_VERTEX_STREAMS]; + LLVMValueRef total_emitted_vertices_vec_ptr[PIPE_MAX_VERTEX_STREAMS]; + LLVMValueRef emitted_vertices_vec_ptr[PIPE_MAX_VERTEX_STREAMS]; LLVMValueRef max_output_vertices_vec; struct lp_bld_tgsi_system_values system_values; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c index 828cf5e7028..e1e476e35ce 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir_soa.c @@ -1318,7 +1318,7 @@ static void emit_vertex(struct lp_build_nir_context *bld_base, uint32_t stream_i assert(bld->gs_iface->emit_vertex); LLVMValueRef total_emitted_vertices_vec = - LLVMBuildLoad(builder, bld->total_emitted_vertices_vec_ptr, ""); + LLVMBuildLoad(builder, bld->total_emitted_vertices_vec_ptr[stream_id], ""); LLVMValueRef mask = mask_vec(bld_base); mask = clamp_mask_to_max_output_vertices(bld, mask, total_emitted_vertices_vec); @@ -1327,38 +1327,39 @@ static void emit_vertex(struct lp_build_nir_context *bld_base, uint32_t stream_i total_emitted_vertices_vec, lp_build_const_int_vec(bld->bld_base.base.gallivm, bld->bld_base.base.type, stream_id)); - increment_vec_ptr_by_mask(bld_base, bld->emitted_vertices_vec_ptr, + increment_vec_ptr_by_mask(bld_base, bld->emitted_vertices_vec_ptr[stream_id], mask); - increment_vec_ptr_by_mask(bld_base, bld->total_emitted_vertices_vec_ptr, + increment_vec_ptr_by_mask(bld_base, bld->total_emitted_vertices_vec_ptr[stream_id], mask); } static void end_primitive_masked(struct lp_build_nir_context * bld_base, - LLVMValueRef mask) + LLVMValueRef mask, uint32_t stream_id) { struct lp_build_nir_soa_context *bld = (struct lp_build_nir_soa_context *)bld_base; LLVMBuilderRef builder = bld->bld_base.base.gallivm->builder; struct lp_build_context *uint_bld = &bld_base->uint_bld; LLVMValueRef emitted_vertices_vec = - LLVMBuildLoad(builder, bld->emitted_vertices_vec_ptr, ""); + LLVMBuildLoad(builder, bld->emitted_vertices_vec_ptr[stream_id], ""); LLVMValueRef emitted_prims_vec = - LLVMBuildLoad(builder, bld->emitted_prims_vec_ptr, ""); + LLVMBuildLoad(builder, bld->emitted_prims_vec_ptr[stream_id], ""); LLVMValueRef total_emitted_vertices_vec = - LLVMBuildLoad(builder, bld->total_emitted_vertices_vec_ptr, ""); + LLVMBuildLoad(builder, bld->total_emitted_vertices_vec_ptr[stream_id], ""); LLVMValueRef emitted_mask = lp_build_cmp(uint_bld, PIPE_FUNC_NOTEQUAL, emitted_vertices_vec, uint_bld->zero); mask = LLVMBuildAnd(builder, mask, emitted_mask, ""); - bld->gs_iface->end_primitive(bld->gs_iface, &bld->bld_base.base, - total_emitted_vertices_vec, - emitted_vertices_vec, emitted_prims_vec, mask_vec(bld_base)); - increment_vec_ptr_by_mask(bld_base, bld->emitted_prims_vec_ptr, + 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_vec(bld_base)); + 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, + clear_uint_vec_ptr_from_mask(bld_base, bld->emitted_vertices_vec_ptr[stream_id], mask); } @@ -1369,7 +1370,7 @@ static void end_primitive(struct lp_build_nir_context *bld_base, uint32_t stream assert(bld->gs_iface->end_primitive); LLVMValueRef mask = mask_vec(bld_base); - end_primitive_masked(bld_base, mask); + end_primitive_masked(bld_base, mask, stream_id); } static void @@ -1579,12 +1580,14 @@ void lp_build_nir_soa(struct gallivm_state *gallivm, bld.max_output_vertices_vec = lp_build_const_int_vec(gallivm, bld.bld_base.int_bld.type, shader->info.gs.vertices_out); - bld.emitted_prims_vec_ptr = - lp_build_alloca(gallivm, uint_bld->vec_type, "emitted_prims_ptr"); - bld.emitted_vertices_vec_ptr = - lp_build_alloca(gallivm, uint_bld->vec_type, "emitted_vertices_ptr"); - bld.total_emitted_vertices_vec_ptr = - lp_build_alloca(gallivm, uint_bld->vec_type, "total_emitted_vertices_ptr"); + for (int i = 0; i < PIPE_MAX_VERTEX_STREAMS; i++) { + bld.emitted_prims_vec_ptr[i] = + lp_build_alloca(gallivm, uint_bld->vec_type, "emitted_prims_ptr"); + bld.emitted_vertices_vec_ptr[i] = + lp_build_alloca(gallivm, uint_bld->vec_type, "emitted_vertices_ptr"); + bld.total_emitted_vertices_vec_ptr[i] = + lp_build_alloca(gallivm, uint_bld->vec_type, "total_emitted_vertices_ptr"); + } } lp_exec_mask_init(&bld.exec_mask, &bld.bld_base.int_bld); @@ -1599,15 +1602,18 @@ void lp_build_nir_soa(struct gallivm_state *gallivm, LLVMBuilderRef builder = bld.bld_base.base.gallivm->builder; LLVMValueRef total_emitted_vertices_vec; LLVMValueRef emitted_prims_vec; - end_primitive_masked(&bld.bld_base, lp_build_mask_value(bld.mask)); - total_emitted_vertices_vec = - LLVMBuildLoad(builder, bld.total_emitted_vertices_vec_ptr, ""); - emitted_prims_vec = - LLVMBuildLoad(builder, bld.emitted_prims_vec_ptr, ""); - - bld.gs_iface->gs_epilogue(bld.gs_iface, - total_emitted_vertices_vec, - emitted_prims_vec, 0); + + end_primitive_masked(&bld.bld_base, lp_build_mask_value(bld.mask), 0); + for (int i = 0; i < PIPE_MAX_VERTEX_STREAMS; i++) { + total_emitted_vertices_vec = + LLVMBuildLoad(builder, bld.total_emitted_vertices_vec_ptr[i], ""); + + emitted_prims_vec = + LLVMBuildLoad(builder, bld.emitted_prims_vec_ptr[i], ""); + bld.gs_iface->gs_epilogue(bld.gs_iface, + total_emitted_vertices_vec, + emitted_prims_vec, i); + } } lp_exec_mask_fini(&bld.exec_mask); } -- 2.30.2