fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-12 06:50:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ntv: do gl-style shared/task lowering for vulkan mode

Browse source 
otherwise shaders come in with variables of type shared, which is not
implemented

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40151>
This commit is contained in:
Mike Blumenkrantz 2026-02-26 17:13:05 -05:00 • committed by Marge Bot
parent dfb4f90a51
commit be93526ea9
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -5664,6 +5664,17 @@ lower_vri_to_var(nir_shader *nir)
nir_metadata_control_flow, NULL);
}
static void
shared_type_info(const struct glsl_type *type, unsigned *size, unsigned *align)
{
assert(glsl_type_is_vector_or_scalar(type));
uint32_t comp_size = glsl_type_is_boolean(type)
? 4 : glsl_get_bit_size(type) / 8;
unsigned length = glsl_get_vector_elements(type);
*size = comp_size * length,
*align = comp_size * (length == 3 ? 4 : length);
}
/* this is the bare minimum required to make vtn shaders work with ntv */
void
ntv_shader_prepare(nir_shader *nir)
@ -5675,6 +5686,13 @@ ntv_shader_prepare(nir_shader *nir)
NIR_PASS(_, nir, nir_split_per_member_structs);
NIR_PASS(_, nir, nir_lower_returns);
NIR_PASS(_, nir, nir_inline_functions);
if (nir->info.stage == MESA_SHADER_COMPUTE ||
nir->info.stage == MESA_SHADER_TASK ||
nir->info.stage == MESA_SHADER_MESH) {
nir_variable_mode modes = nir_var_mem_shared | nir_var_mem_task_payload;
NIR_PASS(_, nir, nir_lower_vars_to_explicit_types, modes, shared_type_info);
NIR_PASS(_, nir, nir_lower_explicit_io, modes, nir_address_format_32bit_offset);
}
nir_cleanup_functions(nir);
optimize_nir(nir);
NIR_PASS(_, nir, nir_lower_variable_initializers, nir_var_shader_temp);