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

nir: Handle lowered I/O in lower_viewport_transform()

Browse source 
While we're here, make the variable handling a little more robust by
checking the deref mode before assuming there's a reachable variable.

Reviewed-by: Olivia Lee <olivia.lee@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38265>
This commit is contained in:
Faith Ekstrand 2025-11-05 11:26:25 -05:00 • committed by Marge Bot
parent 949a4458ea
commit 5ed35866c2
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/compiler/nir/nir_lower_viewport_transform.c
View file

@ -50,18 +50,31 @@ static bool
lower_viewport_transform_instr(nir_builder *b, nir_intrinsic_instr *intr,
void *data)
{
if (intr->intrinsic != nir_intrinsic_store_deref)
return false;
gl_varying_slot location = VARYING_SLOT_MAX;
nir_src *pos_src;
nir_variable *var = nir_intrinsic_get_var(intr, 0);
if (var->data.mode != nir_var_shader_out ||
var->data.location != VARYING_SLOT_POS)
if (intr->intrinsic == nir_intrinsic_store_deref) {
nir_deref_instr *deref = nir_src_as_deref(intr->src[0]);
if (!nir_deref_mode_is(deref, nir_var_shader_out))
return false;
nir_variable *var = nir_deref_instr_get_variable(deref);
location = var->data.location;
pos_src = &intr->src[1];
} else if (intr->intrinsic == nir_intrinsic_store_output ||
intr->intrinsic == nir_intrinsic_store_per_view_output) {
location = nir_intrinsic_io_semantics(intr).location;
pos_src = &intr->src[0];
}
if (location != VARYING_SLOT_POS)
return false;
b->cursor = nir_before_instr(&intr->instr);
/* Grab the source and viewport */
nir_def *input_point = intr->src[1].ssa;
nir_def *input_point = pos_src->ssa;
assert(input_point->num_components == 4);
nir_def *scale = nir_load_viewport_scale(b);
nir_def *offset = nir_load_viewport_offset(b);
@ -93,7 +106,7 @@ lower_viewport_transform_instr(nir_builder *b, nir_intrinsic_instr *intr,
nir_channel(b, screen, 2),
w_recip);
nir_src_rewrite(&intr->src[1], screen_space);
nir_src_rewrite(pos_src, screen_space);
return true;
}