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

nir/load_store_vectorize: fix division by zero

Browse source 
Don't use glsl_get_explicit_stride as it may return 0 for vector types,
use nir_deref_instr_array_stride instead.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31460>
This commit is contained in:
Job Noorman 2024-10-01 13:57:38 +02:00 • committed by Marge Bot
parent 366f63fd88
commit 584b63ecab
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/nir/nir_opt_load_store_vectorize.c
View file

@ -674,6 +674,7 @@ subtract_deref(nir_builder *b, nir_deref_instr *deref, int64_t offset)
nir_src_is_const(deref->arr.index) &&
offset % nir_deref_instr_array_stride(deref) == 0) {
unsigned stride = nir_deref_instr_array_stride(deref);
assert(stride != 0);
nir_def *index = nir_imm_intN_t(b, nir_src_as_int(deref->arr.index) - offset / stride,
deref->def.bit_size);
return nir_build_deref_ptr_as_array(b, nir_deref_instr_parent(deref), index);
@ -682,7 +683,8 @@ subtract_deref(nir_builder *b, nir_deref_instr *deref, int64_t offset)
if (deref->deref_type == nir_deref_type_array &&
nir_src_is_const(deref->arr.index)) {
nir_deref_instr *parent = nir_deref_instr_parent(deref);
unsigned stride = glsl_get_explicit_stride(parent->type);
unsigned stride = nir_deref_instr_array_stride(deref);
assert(stride != 0);
if (offset % stride == 0)
return nir_build_deref_array_imm(
b, parent, nir_src_as_int(deref->arr.index) - offset / stride);