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

nir/lower_tex: avoid undefined-behavior
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
When texture_index and sampler_index are over 32, we can't really check
for them in a single 32-bit word. This happens among other things when
Panfrost uses preload shaders on v9 and later. Otherwise, we trigger
undefined behavior.

We're already doing this for textures in one case, let's be consistent.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34365>
This commit is contained in:
Erik Faye-Lund 2025-04-03 14:25:01 +00:00 • committed by Marge Bot
parent 41b136f674
commit 1d5da22dfd
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/compiler/nir/nir_lower_tex.c
View file

@ -1520,12 +1520,12 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
/* mask of src coords to saturate (clamp): */
unsigned sat_mask = 0;
/* ignore saturate for txf ops: these don't use samplers and can't GL_CLAMP */
if (nir_tex_instr_need_sampler(tex)) {
if ((1 << tex->sampler_index) & options->saturate_r)
if (nir_tex_instr_need_sampler(tex) && tex->sampler_index < 32) {
if ((1u << tex->sampler_index) & options->saturate_r)
sat_mask |= (1 << 2); /* .z */
if ((1 << tex->sampler_index) & options->saturate_t)
if ((1u << tex->sampler_index) & options->saturate_t)
sat_mask |= (1 << 1); /* .y */
if ((1 << tex->sampler_index) & options->saturate_s)
if ((1u << tex->sampler_index) & options->saturate_s)
sat_mask |= (1 << 0); /* .x */
}
@ -1568,14 +1568,15 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
}
unsigned texture_index = tex->texture_index;
uint32_t texture_mask = 1u << texture_index;
uint32_t texture_mask;
int tex_index = nir_tex_instr_src_index(tex, nir_tex_src_texture_deref);
if (tex_index >= 0) {
nir_deref_instr *deref = nir_src_as_deref(tex->src[tex_index].src);
nir_variable *var = nir_deref_instr_get_variable(deref);
texture_index = var ? var->data.binding : 0;
texture_mask = var && texture_index < 32 ? (1u << texture_index) : 0u;
}
} else
texture_mask = texture_index < 32 ? (1u << texture_index) : 0u;
if (texture_mask & options->lower_y_uv_external) {
lower_y_uv_external(b, tex, options, texture_index);