AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_input_attachments: Stop assuming tex src indices

Browse Source 
There's nothing in NIR which guarantees that the deref is the first
source or that the coordinate is the second.  Use
nir_tex_instr_src_index() to get the actual indices.

Fixes: 84b08971fb ("nir/lower_input_attachments: lower nir_texop_fragment_{mask}_fetch")
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35551>
This commit is contained in:
Faith Ekstrand
2025-06-16 12:02:12 -04:00
committed by Marge Bot
parent f872cbea37
commit 9a52b9372c
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/nir/nir_lower_input_attachments.c
View File

@@ -159,11 +159,19 @@ static bool
try_lower_input_texop(nir_builder *b, nir_tex_instr *tex,
const nir_input_attachment_options *options)
{
nir_deref_instr *deref = nir_src_as_deref(tex->src[0].src);
const int texture_src_idx =
nir_tex_instr_src_index(tex, nir_tex_src_texture_deref);
if (texture_src_idx < 0)
return false;
nir_deref_instr *deref = nir_src_as_deref(tex->src[texture_src_idx].src);
if (glsl_get_sampler_dim(deref->type) != GLSL_SAMPLER_DIM_SUBPASS_MS)
return false;
const int coord_src_idx = nir_tex_instr_src_index(tex, nir_tex_src_coord);
assert(coord_src_idx >= 0);
b->cursor = nir_before_instr(&tex->instr);
nir_def *frag_coord = load_frag_coord(b, deref, options);
@@ -175,7 +183,7 @@ try_lower_input_texop(nir_builder *b, nir_tex_instr *tex,
tex->coord_components = 3;
nir_src_rewrite(&tex->src[1].src, coord);
nir_src_rewrite(&tex->src[coord_src_idx].src, coord);
return true;
}