fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Handle load_first_vertex in nvk_nir_lower_descriptors()

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26197>
This commit is contained in:
Faith Ekstrand 2023-11-14 10:49:29 -06:00 • committed by Marge Bot
parent 82061b1b9d
commit e507d70333
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/nouveau/vulkan/nvk_nir_lower_descriptors.c
View file

@ -336,6 +336,7 @@ try_lower_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
return lower_load_push_constant(b, intrin, ctx);
case nir_intrinsic_load_base_vertex:
case nir_intrinsic_load_first_vertex:
return lower_sysval_to_root_table(b, intrin, draw.base_vertex, ctx);
case nir_intrinsic_load_base_instance:

27
src/nouveau/vulkan/nvk_shader.c
View file

@ -323,26 +323,6 @@ lower_fragcoord_instr(nir_builder *b, nir_instr *instr, UNUSED void *_data)
return true;
}
static bool
lower_system_value_first_vertex(nir_builder *b, nir_instr *instr, UNUSED void *_data)
{
assert(b->shader->info.stage == MESA_SHADER_VERTEX);
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic != nir_intrinsic_load_first_vertex)
return false;
b->cursor = nir_before_instr(&intrin->instr);
nir_def *base_vertex = nir_load_base_vertex(b);
nir_def_rewrite_uses(&intrin->def, base_vertex);
return true;
}
static int
count_location_slots(const struct glsl_type *type, bool bindless)
{
@ -538,13 +518,6 @@ nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
NIR_PASS(_, nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
NIR_PASS(_, nir, nir_lower_system_values);
if (nir->info.stage == MESA_SHADER_VERTEX) {
// codegen does not support SYSTEM_VALUE_FIRST_VERTEX
NIR_PASS(_, nir, nir_shader_instructions_pass,
lower_system_value_first_vertex,
nir_metadata_block_index | nir_metadata_dominance, NULL);
}
if (nir->info.stage == MESA_SHADER_FRAGMENT) {
if (!use_nak(pdev, nir->info.stage)) {
NIR_PASS(_, nir, nir_shader_instructions_pass, lower_fragcoord_instr,