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

nir/lower_tex: don't calculate texture_mask for texture_index>=32

Browse source 
With Vulkan, texture_index can be 32 or larger, which creates a shift
exponent larger than 31 (undefined behaviour). Since we don't use
texture_mask with Vulkan, just initialize it to 0.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Gitlab: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5365
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12901>
This commit is contained in:
Rhys Perry 2021-09-16 17:24:46 +01:00 • committed by Marge Bot
parent 26d2e22eea
commit 811a7a2d31
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1311,7 +1311,7 @@ nir_lower_tex_block(nir_block *block, nir_builder *b,
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 ? (1u << texture_index) : 0u;
texture_mask = var && texture_index < 32 ? (1u << texture_index) : 0u;
}
if (texture_mask & options->lower_y_uv_external) {