fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 14:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

brw: Lower tesslevel vars to vectors even for unlinked TCS/TES

Browse source 
st/nir lowers this for iris, and brw_link_shaders lowers this for anv,
but for unlinked tessellation control / evaluation shaders, the lowering
was not happening for TCS.

Just do it unconditionally when lowering TCS outputs and TES inputs.
This lets the remapping code just assume vectors all the time, rather
than getting single component stores with nir_intrinsic_component set
(which came from nir_lower_io lowering compact arrays).

This also requires changes to the dynamic unlinked TCS/TES lowering to
temporaries, which needs to use vectors rather than arrays with this
change.  That code is going away in future patches anyway, but this
keeps it going for now to avoid interim breakage.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38482>
This commit is contained in:
Kenneth Graunke 2025-11-13 13:05:39 -08:00 • committed by Marge Bot
parent 7736e693b1
commit 7d1dfc3468
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/intel/compiler/brw/brw_nir.c
View file

@ -232,18 +232,11 @@ remap_tess_levels_to_temporary(nir_builder *b, nir_intrinsic_instr *intrin, void
state->inner_factors_var : state->outer_factors_var;
if (nir_intrinsic_infos[intrin->intrinsic].has_dest) {
b->cursor = nir_after_instr(&intrin->instr);
nir_def *new_val =
nir_load_array_var(b, var,
nir_iadd_imm(b, nir_get_io_offset_src(intrin)->ssa,
nir_intrinsic_component(intrin)));
nir_def_replace(&intrin->def, new_val);
nir_def_replace(&intrin->def, nir_load_var(b, var));
} else {
b->cursor = nir_instr_remove(&intrin->instr);
nir_store_array_var(b, var,
nir_iadd_imm(b, nir_get_io_offset_src(intrin)->ssa,
nir_intrinsic_component(intrin)),
intrin->src[0].ssa,
nir_intrinsic_write_mask(intrin));
nir_store_var(b, var, nir_pad_vector(b, intrin->src[0].ssa, 4),
nir_intrinsic_write_mask(intrin));
}
return true;
@ -256,11 +249,9 @@ remap_tess_levels_legacy_dynamic(nir_shader *nir,
nir_function_impl *impl = nir_shader_get_entrypoint(nir);
struct tess_levels_temporary_state state = {
.inner_factors_var = nir_local_variable_create(
impl, glsl_array_type(glsl_uint_type(), 2, 0),
.inner_factors_var = nir_local_variable_create(impl, glsl_vec4_type(),
"__temp_inner_factors"),
.outer_factors_var = nir_local_variable_create(
impl, glsl_array_type(glsl_uint_type(), 4, 0),
.outer_factors_var = nir_local_variable_create(impl, glsl_vec4_type(),
"__temp_outer_factors"),
};
@ -673,6 +664,8 @@ brw_nir_lower_tes_inputs(nir_shader *nir,
const struct intel_device_info *devinfo,
const struct intel_vue_map *vue_map)
{
NIR_PASS(_, nir, nir_lower_tess_level_array_vars_to_vec);
nir_foreach_shader_in_variable(var, nir)
var->data.driver_location = var->data.location;
@ -957,6 +950,8 @@ brw_nir_lower_tcs_outputs(nir_shader *nir,
const struct intel_vue_map *vue_map,
enum tess_primitive_mode tes_primitive_mode)
{
NIR_PASS(_, nir, nir_lower_tess_level_array_vars_to_vec);
nir_foreach_shader_out_variable(var, nir) {
var->data.driver_location = var->data.location;
}