Module: Mesa Branch: main Commit: 43715516fcbcc5155c3f270e50641857ae86403a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43715516fcbcc5155c3f270e50641857ae86403a
Author: Yonggang Luo <[email protected]> Date: Tue Oct 10 05:22:15 2023 +0800 treewide: Merge num_mesh_vertices_per_primitive and u_vertices_per_prim into mesa_vertices_per_prim Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25880> --- src/amd/common/ac_nir_lower_ngg.c | 2 +- src/broadcom/vulkan/v3dv_pipeline.c | 3 +- src/compiler/nir/nir_passthrough_gs.c | 3 +- src/compiler/shader_enums.c | 2 +- src/compiler/shader_enums.h | 2 +- src/compiler/spirv/spirv_to_nir.c | 2 +- src/gallium/auxiliary/draw/draw_mesh_prim.c | 3 +- src/gallium/auxiliary/draw/draw_prim_assembler.c | 2 +- src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 3 +- src/gallium/auxiliary/tgsi/tgsi_sanity.c | 3 +- src/gallium/auxiliary/tgsi/tgsi_scan.c | 3 +- src/gallium/auxiliary/tgsi/tgsi_text.c | 3 +- src/gallium/auxiliary/util/u_prim.h | 36 ------------------------ src/gallium/drivers/asahi/agx_streamout.c | 2 +- src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc | 5 ++-- src/gallium/drivers/llvmpipe/lp_state_cs.c | 3 +- src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 5 ++-- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 3 +- src/gallium/drivers/radeonsi/si_shader_info.c | 3 +- src/gallium/drivers/v3d/v3d_job.c | 3 +- src/intel/compiler/brw_mesh.cpp | 4 +-- src/intel/vulkan/anv_mesh_perprim_wa.c | 2 +- 22 files changed, 24 insertions(+), 73 deletions(-) diff --git a/src/amd/common/ac_nir_lower_ngg.c b/src/amd/common/ac_nir_lower_ngg.c index eaa675bf13e..8019e6af19c 100644 --- a/src/amd/common/ac_nir_lower_ngg.c +++ b/src/amd/common/ac_nir_lower_ngg.c @@ -4912,7 +4912,7 @@ ac_nir_lower_ngg_ms(nir_shader *shader, bool fast_launch_2) { unsigned vertices_per_prim = - num_mesh_vertices_per_primitive(shader->info.mesh.primitive_type); + mesa_vertices_per_prim(shader->info.mesh.primitive_type); uint64_t per_vertex_outputs = shader->info.outputs_written & ~shader->info.per_primitive_outputs & ~SPECIAL_MS_OUT_MASK; diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index cf25567204e..3b182951efe 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -33,7 +33,6 @@ #include "nir/nir_serialize.h" #include "util/u_atomic.h" -#include "util/u_prim.h" #include "util/os_time.h" #include "util/u_helpers.h" @@ -2211,7 +2210,7 @@ pipeline_add_multiview_gs(struct v3dv_pipeline *pipeline, nir->info.outputs_written = vs_nir->info.outputs_written | (1ull << VARYING_SLOT_LAYER); - uint32_t vertex_count = u_vertices_per_prim(pipeline->topology); + uint32_t vertex_count = mesa_vertices_per_prim(pipeline->topology); nir->info.gs.input_primitive = multiview_gs_input_primitive_from_pipeline(pipeline); nir->info.gs.output_primitive = diff --git a/src/compiler/nir/nir_passthrough_gs.c b/src/compiler/nir/nir_passthrough_gs.c index 39eade79efb..e6503c2ab73 100644 --- a/src/compiler/nir/nir_passthrough_gs.c +++ b/src/compiler/nir/nir_passthrough_gs.c @@ -22,7 +22,6 @@ */ #include "util/u_memory.h" -#include "util/u_prim.h" #include "nir.h" #include "nir_builder.h" #include "nir_xfb_info.h" @@ -138,7 +137,7 @@ nir_create_passthrough_gs(const nir_shader_compiler_options *options, nir_shader *nir = b.shader; nir->info.gs.input_primitive = gs_in_prim_for_topology(primitive_type); nir->info.gs.output_primitive = force_line_strip_out ? MESA_PRIM_LINE_STRIP : original_our_prim; - nir->info.gs.vertices_in = u_vertices_per_prim(primitive_type); + nir->info.gs.vertices_in = mesa_vertices_per_prim(primitive_type); nir->info.gs.vertices_out = needs_closing ? vertices_out + 1 : vertices_out; nir->info.gs.invocations = 1; nir->info.gs.active_stream_mask = 1; diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c index b514a7adad2..e8647fb9834 100644 --- a/src/compiler/shader_enums.c +++ b/src/compiler/shader_enums.c @@ -434,7 +434,7 @@ gl_frag_result_name(gl_frag_result result) } unsigned -num_mesh_vertices_per_primitive(enum mesa_prim prim) +mesa_vertices_per_prim(enum mesa_prim prim) { switch(prim) { case MESA_PRIM_POINTS: diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 551952b5abb..ce1dbbb1137 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -1191,7 +1191,7 @@ enum ENUM_PACKED mesa_prim /** * Number of vertices per primitive as seen by a geometry or mesh shader. */ -unsigned num_mesh_vertices_per_primitive(enum mesa_prim prim); +unsigned mesa_vertices_per_prim(enum mesa_prim prim); /** * A compare function enum for use in compiler lowering passes. This is in diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index 2587c866723..4729916b807 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -5996,7 +5996,7 @@ vtn_handle_write_packed_primitive_indices(struct vtn_builder *b, SpvOp opcode, if (!indices) { unsigned vertices_per_prim = - num_mesh_vertices_per_primitive(b->shader->info.mesh.primitive_type); + mesa_vertices_per_prim(b->shader->info.mesh.primitive_type); unsigned max_prim_indices = vertices_per_prim * b->shader->info.mesh.max_primitives_out; const struct glsl_type *t = diff --git a/src/gallium/auxiliary/draw/draw_mesh_prim.c b/src/gallium/auxiliary/draw/draw_mesh_prim.c index f4ff70271b6..ac91c27ae42 100644 --- a/src/gallium/auxiliary/draw/draw_mesh_prim.c +++ b/src/gallium/auxiliary/draw/draw_mesh_prim.c @@ -35,7 +35,6 @@ #include "draw/draw_private.h" #include "util/u_debug.h" #include "util/u_memory.h" -#include "util/u_prim.h" #include "pipe/p_defines.h" @@ -187,7 +186,7 @@ draw_mesh_prim_run(struct draw_context *draw, struct draw_mesh_prim *asmblr = &asmblr_mesh; unsigned start, i; unsigned max_primitives = input_prims->primitive_count; - unsigned max_verts = u_vertices_per_prim(input_prims->prim) * max_primitives; + unsigned max_verts = mesa_vertices_per_prim(input_prims->prim) * max_primitives; asmblr->output_prims = output_prims; asmblr->output_verts = output_verts; diff --git a/src/gallium/auxiliary/draw/draw_prim_assembler.c b/src/gallium/auxiliary/draw/draw_prim_assembler.c index 069b4f76773..47e8d55d5c2 100644 --- a/src/gallium/auxiliary/draw/draw_prim_assembler.c +++ b/src/gallium/auxiliary/draw/draw_prim_assembler.c @@ -276,7 +276,7 @@ draw_prim_assembler_run(struct draw_context *draw, MESA_PRIM_QUADS : u_reduced_prim(input_prims->prim); unsigned max_primitives = u_decomposed_prims_for_vertices( input_prims->prim, input_prims->count); - unsigned max_verts = u_vertices_per_prim(assembled_prim) * max_primitives; + unsigned max_verts = mesa_vertices_per_prim(assembled_prim) * max_primitives; asmblr->output_prims = output_prims; asmblr->output_verts = output_verts; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index fba89e57712..d4b0f8846c2 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -41,7 +41,6 @@ #include "util/u_debug.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_prim.h" #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_exec.h" #include "tgsi/tgsi_info.h" @@ -1169,7 +1168,7 @@ emit_fetch_gs_input( /* * A fixed 6 should do as well (which is what we allocate). */ - int index_limit = u_vertices_per_prim(info->properties[TGSI_PROPERTY_GS_INPUT_PRIM]); + int index_limit = mesa_vertices_per_prim(info->properties[TGSI_PROPERTY_GS_INPUT_PRIM]); vertex_index = get_indirect_index(bld, reg->Register.File, reg->Dimension.Index, diff --git a/src/gallium/auxiliary/tgsi/tgsi_sanity.c b/src/gallium/auxiliary/tgsi/tgsi_sanity.c index 273459af354..472145fcf1e 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_sanity.c +++ b/src/gallium/auxiliary/tgsi/tgsi_sanity.c @@ -27,7 +27,6 @@ #include "util/u_debug.h" #include "util/u_memory.h" -#include "util/u_prim.h" #include "cso_cache/cso_hash.h" #include "tgsi_sanity.h" #include "tgsi_info.h" @@ -490,7 +489,7 @@ iter_property( if (iter->processor.Processor == PIPE_SHADER_GEOMETRY && prop->Property.PropertyName == TGSI_PROPERTY_GS_INPUT_PRIM) { - ctx->implied_array_size = u_vertices_per_prim(prop->u[0].Data); + ctx->implied_array_size = mesa_vertices_per_prim(prop->u[0].Data); } if (iter->processor.Processor == PIPE_SHADER_TESS_CTRL && prop->Property.PropertyName == TGSI_PROPERTY_TCS_VERTICES_OUT) diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c index 4f505dd3978..a9aa0fe4b5c 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.c +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c @@ -37,7 +37,6 @@ #include "util/u_debug.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_prim.h" #include "tgsi/tgsi_info.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_util.h" @@ -656,7 +655,7 @@ tgsi_scan_shader(const struct tgsi_token *tokens, if (procType == PIPE_SHADER_GEOMETRY) { unsigned input_primitive = info->properties[TGSI_PROPERTY_GS_INPUT_PRIM]; - int num_verts = u_vertices_per_prim(input_primitive); + int num_verts = mesa_vertices_per_prim(input_primitive); int j; info->file_count[TGSI_FILE_INPUT] = num_verts; info->file_max[TGSI_FILE_INPUT] = diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index e2480a36c4b..11bfddfd726 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -27,7 +27,6 @@ #include "util/u_debug.h" #include "util/u_memory.h" -#include "util/u_prim.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" #include "util/strtod.h" @@ -1758,7 +1757,7 @@ static bool parse_property( struct translate_ctx *ctx ) } if (property_name == TGSI_PROPERTY_GS_INPUT_PRIM && ctx->processor == PIPE_SHADER_GEOMETRY) { - ctx->implied_array_size = u_vertices_per_prim(values[0]); + ctx->implied_array_size = mesa_vertices_per_prim(values[0]); } break; case TGSI_PROPERTY_FS_COORD_ORIGIN: diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h index 64e1481cfa7..c073ce5c9d3 100644 --- a/src/gallium/auxiliary/util/u_prim.h +++ b/src/gallium/auxiliary/util/u_prim.h @@ -181,42 +181,6 @@ u_trim_pipe_prim(enum mesa_prim pipe_prim, unsigned *nr) } } -static inline unsigned -u_vertices_per_prim(enum mesa_prim primitive) -{ - switch(primitive) { - case MESA_PRIM_POINTS: - return 1; - case MESA_PRIM_LINES: - case MESA_PRIM_LINE_LOOP: - case MESA_PRIM_LINE_STRIP: - return 2; - case MESA_PRIM_TRIANGLES: - case MESA_PRIM_TRIANGLE_STRIP: - case MESA_PRIM_TRIANGLE_FAN: - return 3; - case MESA_PRIM_LINES_ADJACENCY: - case MESA_PRIM_LINE_STRIP_ADJACENCY: - return 4; - case MESA_PRIM_TRIANGLES_ADJACENCY: - case MESA_PRIM_TRIANGLE_STRIP_ADJACENCY: - return 6; - - case MESA_PRIM_QUADS: - case MESA_PRIM_QUAD_STRIP: - /* these won't be seen from geometry shaders - but prim assembly might for prim id. */ - return 4; - - /* following primitives should never be used - * with geometry shaders abd their size is - * undefined */ - case MESA_PRIM_POLYGON: - default: - debug_printf("Unrecognized geometry shader primitive"); - return 3; - } -} /** * Returns the number of decomposed primitives for the given diff --git a/src/gallium/drivers/asahi/agx_streamout.c b/src/gallium/drivers/asahi/agx_streamout.c index 0fa7990cf6b..23b778cc2b9 100644 --- a/src/gallium/drivers/asahi/agx_streamout.c +++ b/src/gallium/drivers/asahi/agx_streamout.c @@ -287,7 +287,7 @@ primitive_fits(nir_builder *b, struct agx_xfb_key *key) /* Get the number of vertices per primitive in the current mode, usually just * the base number but quads are tessellated. */ - uint32_t verts_per_prim = u_vertices_per_prim(key->mode); + uint32_t verts_per_prim = mesa_vertices_per_prim(key->mode); if (u_decomposed_prim(key->mode) == MESA_PRIM_QUADS) verts_per_prim = 6; diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc index d9365b0bdde..ad3374cd780 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc +++ b/src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc @@ -24,7 +24,6 @@ #define FD_BO_NO_HARDPIN 1 #include "pipe/p_state.h" -#include "util/u_prim.h" #include "freedreno_batch.h" #include "freedreno_gmem.h" @@ -69,7 +68,7 @@ prim_count(const struct pipe_draw_info *info, { /* MESA_PRIM_COUNT used internally for RECTLIST blits on 3d pipe: */ unsigned vtx_per_prim = - (info->mode == MESA_PRIM_COUNT) ? 2 : u_vertices_per_prim(info->mode); + (info->mode == MESA_PRIM_COUNT) ? 2 : mesa_vertices_per_prim(info->mode); return MAX2(1, (draw->count * info->instance_count) / vtx_per_prim); } @@ -157,7 +156,7 @@ fd6_vsc_update_sizes(struct fd_batch *batch, const struct pipe_draw_info *info, prim_strm_bits, draw_strm_bits, batch->num_bins_per_pipe, info->instance_count, info->count, (info->count * info->instance_count) / - u_vertices_per_prim(info->mode), + mesa_vertices_per_prim(info->mode), u_prim_name(info->mode)); #endif diff --git a/src/gallium/drivers/llvmpipe/lp_state_cs.c b/src/gallium/drivers/llvmpipe/lp_state_cs.c index 1a8d26ed2a9..c4661ced025 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_cs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_cs.c @@ -26,7 +26,6 @@ #include "util/u_memory.h" #include "util/os_time.h" #include "util/u_dump.h" -#include "util/u_prim.h" #include "util/u_string.h" #include "gallivm/lp_bld_const.h" #include "gallivm/lp_bld_debug.h" @@ -2042,7 +2041,7 @@ lp_mesh_call_draw(struct llvmpipe_context *lp, int vsize, int psize, int per_prim_count, size_t prim_offset) { - unsigned prim_len = u_vertices_per_prim(prim); + unsigned prim_len = mesa_vertices_per_prim(prim); uint32_t *ptr = (uint32_t *)((char *)vbuf + task_out_size * task_idx); uint32_t vertex_count = ptr[1]; uint32_t prim_count = ptr[2]; diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c index 4d2272ff470..3c431cf0bbc 100644 --- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c +++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c @@ -7,14 +7,13 @@ #include "si_pipe.h" #include "si_query.h" #include "si_shader_internal.h" -#include "util/u_prim.h" unsigned gfx10_ngg_get_vertices_per_prim(struct si_shader *shader) { const struct si_shader_info *info = &shader->selector->info; if (shader->selector->stage == MESA_SHADER_GEOMETRY) - return u_vertices_per_prim(info->base.gs.output_primitive); + return mesa_vertices_per_prim(info->base.gs.output_primitive); else if (shader->selector->stage == MESA_SHADER_VERTEX) { if (info->base.vs.blit_sgprs_amd) { /* Blits always use axis-aligned rectangles with 3 vertices. */ @@ -86,7 +85,7 @@ bool gfx10_ngg_calculate_subgroup_info(struct si_shader *shader) const unsigned input_prim = si_get_input_prim(gs_sel, &shader->key); const bool use_adjacency = input_prim >= MESA_PRIM_LINES_ADJACENCY && input_prim <= MESA_PRIM_TRIANGLE_STRIP_ADJACENCY; - const unsigned max_verts_per_prim = u_vertices_per_prim(input_prim); + const unsigned max_verts_per_prim = mesa_vertices_per_prim(input_prim); const unsigned min_verts_per_prim = gs_stage == MESA_SHADER_GEOMETRY ? max_verts_per_prim : 1; /* All these are in dwords. The maximum is 16K dwords (64KB) of LDS per workgroup. */ diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index e8457bb405e..6a44ce13065 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -5,7 +5,6 @@ */ #include "nir_builder.h" -#include "util/u_prim.h" #include "ac_nir.h" #include "si_pipe.h" @@ -41,7 +40,7 @@ static nir_def *get_num_vert_per_prim(nir_builder *b, struct si_shader *shader, unsigned num_vertices; if (stage == MESA_SHADER_GEOMETRY) { - num_vertices = u_vertices_per_prim(info->base.gs.output_primitive); + num_vertices = mesa_vertices_per_prim(info->base.gs.output_primitive); } else if (stage == MESA_SHADER_VERTEX) { if (info->base.vs.blit_sgprs_amd) num_vertices = 3; diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index 4442d8af128..84613c993cb 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -7,7 +7,6 @@ #include "si_pipe.h" #include "si_shader_internal.h" #include "util/mesa-sha1.h" -#include "util/u_prim.h" #include "sid.h" #include "nir.h" @@ -797,7 +796,7 @@ void si_nir_scan_shader(struct si_screen *sscreen, const struct nir_shader *nir, info->gsvs_vertex_size = info->num_outputs * 16; info->max_gsvs_emit_size = info->gsvs_vertex_size * info->base.gs.vertices_out; info->gs_input_verts_per_prim = - u_vertices_per_prim((enum mesa_prim)info->base.gs.input_primitive); + mesa_vertices_per_prim((enum mesa_prim)info->base.gs.input_primitive); } info->clipdist_mask = info->writes_clipvertex ? SI_USER_CLIP_PLANE_MASK : diff --git a/src/gallium/drivers/v3d/v3d_job.c b/src/gallium/drivers/v3d/v3d_job.c index 577890a06c3..d837a9b23ac 100644 --- a/src/gallium/drivers/v3d/v3d_job.c +++ b/src/gallium/drivers/v3d/v3d_job.c @@ -35,7 +35,6 @@ #include "util/hash_table.h" #include "util/ralloc.h" #include "util/set.h" -#include "util/u_prim.h" #include "broadcom/clif/clif_dump.h" void @@ -479,7 +478,7 @@ v3d_read_and_accumulate_primitive_counters(struct v3d_context *v3d) v3d->prog.gs ? v3d->prog.gs->prog_data.gs->out_prim_type : v3d->prim_mode; uint32_t vertices_written = - map[V3D_PRIM_COUNTS_TF_WRITTEN] * u_vertices_per_prim(prim_mode); + map[V3D_PRIM_COUNTS_TF_WRITTEN] * mesa_vertices_per_prim(prim_mode); for (int i = 0; i < v3d->streamout.num_targets; i++) { v3d_stream_output_target(v3d->streamout.targets[i])->offset += vertices_written; diff --git a/src/intel/compiler/brw_mesh.cpp b/src/intel/compiler/brw_mesh.cpp index 2e248afdde5..e2cd61a9339 100644 --- a/src/intel/compiler/brw_mesh.cpp +++ b/src/intel/compiler/brw_mesh.cpp @@ -771,7 +771,7 @@ brw_compute_mue_map(const struct brw_compiler *compiler, memset(&map->len_dw[0], 0, sizeof(map->len_dw)); unsigned vertices_per_primitive = - num_mesh_vertices_per_primitive(nir->info.mesh.primitive_type); + mesa_vertices_per_prim(nir->info.mesh.primitive_type); map->max_primitives = nir->info.mesh.max_primitives_out; map->max_vertices = nir->info.mesh.max_vertices_out; @@ -1317,7 +1317,7 @@ brw_can_pack_primitive_indices(nir_shader *nir, struct index_packing_state *stat return false; state->vertices_per_primitive = - num_mesh_vertices_per_primitive(nir->info.mesh.primitive_type); + mesa_vertices_per_prim(nir->info.mesh.primitive_type); /* packing point indices doesn't help */ if (state->vertices_per_primitive == 1) return false; diff --git a/src/intel/vulkan/anv_mesh_perprim_wa.c b/src/intel/vulkan/anv_mesh_perprim_wa.c index 5f6da43989e..f46d6a1082b 100644 --- a/src/intel/vulkan/anv_mesh_perprim_wa.c +++ b/src/intel/vulkan/anv_mesh_perprim_wa.c @@ -150,7 +150,7 @@ anv_mesh_convert_attrs_prim_to_vert(struct nir_shader *nir, provoking_vertex = 2; unsigned vertices_per_primitive = - num_mesh_vertices_per_primitive(nir->info.mesh.primitive_type); + mesa_vertices_per_prim(nir->info.mesh.primitive_type); nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_builder b = nir_builder_at(nir_after_impl(impl));
