fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 07:18:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nak: Move lowering of load_*_id to lower_vtg_io.c

Browse source 
Reviewed-by: Mary Guillemard <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40512>
This commit is contained in:
Faith Ekstrand 2026-03-19 12:27:03 -04:00 • committed by Marge Bot
parent 3ea2e51c8b
commit ffdc6d3c75
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nouveau/compiler/nak_nir.c
View file

@ -474,23 +474,6 @@ nak_nir_lower_system_value_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
nir_def *val;
switch (intrin->intrinsic) {
case nir_intrinsic_load_primitive_id:
case nir_intrinsic_load_instance_id:
case nir_intrinsic_load_vertex_id: {
assert(b->shader->info.stage != MESA_SHADER_VERTEX ||
b->shader->info.stage != MESA_SHADER_TESS_CTRL ||
b->shader->info.stage == MESA_SHADER_TESS_EVAL ||
b->shader->info.stage == MESA_SHADER_GEOMETRY);
const gl_system_value sysval =
nir_system_value_from_intrinsic(intrin->intrinsic);
const uint32_t addr = nak_sysval_attr_addr(nak, sysval);
val = nir_ald_nv(b, 1, nir_imm_int(b, 0), nir_imm_int(b, 0),
.base = addr, .flags = 0,
.range_base = addr, .range = 4,
.access = ACCESS_CAN_REORDER);
break;
}
case nir_intrinsic_load_patch_vertices_in: {
val = nak_nir_load_sysval(b, NAK_SV_PRIM_TYPE, ACCESS_CAN_REORDER);
val = nir_extract_u8(b, val, nir_imm_int(b, 1));

15
src/nouveau/compiler/nak_nir_lower_vtg_io.c
View file

@ -58,6 +58,21 @@ lower_vtg_io_intrin(nir_builder *b,
nir_def *vtx = NULL, *offset = NULL, *data = NULL;
switch (intrin->intrinsic) {
case nir_intrinsic_load_primitive_id:
case nir_intrinsic_load_instance_id:
case nir_intrinsic_load_vertex_id: {
/* These still input loads but they're a special case */
const gl_system_value sysval =
nir_system_value_from_intrinsic(intrin->intrinsic);
const uint32_t addr = nak_sysval_attr_addr(nak, sysval);
nir_def *val = nir_ald_nv(b, 1, nir_imm_int(b, 0), nir_imm_int(b, 0),
.base = addr, .flags = 0,
.range_base = addr, .range = 4,
.access = ACCESS_CAN_REORDER);
nir_def_rewrite_uses(&intrin->def, val);
return true;
}
case nir_intrinsic_load_input:
case nir_intrinsic_load_output:
offset = intrin->src[0].ssa;