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

nir/unsigned_upper_bound: don't follow 64-bit f2u32()

Browse source 
Fixes Doom Eternal crash.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Fixes: 72ac3f6026 ("nir: add nir_unsigned_upper_bound and nir_addition_might_overflow")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14555>
(cherry picked from commit d95a0b52e4)
This commit is contained in:
Rhys Perry 2022-01-14 13:41:55 +00:00 • committed by Eric Engestrom
parent c7684b11e2
commit 7a579039cc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3748,7 +3748,7 @@
"description": "nir/unsigned_upper_bound: don't follow 64-bit f2u32()",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "72ac3f60261a8510512861b93e843e695331e2ab"
},

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

@ -1465,7 +1465,6 @@ nir_unsigned_upper_bound(nir_shader *shader, struct hash_table *range_ht,
case nir_op_b32csel:
case nir_op_ubfe:
case nir_op_bfm:
case nir_op_f2u32:
case nir_op_fmul:
case nir_op_extract_u8:
case nir_op_extract_i8:
@ -1476,6 +1475,7 @@ nir_unsigned_upper_bound(nir_shader *shader, struct hash_table *range_ht,
case nir_op_u2u8:
case nir_op_u2u16:
case nir_op_u2u32:
case nir_op_f2u32:
if (nir_ssa_scalar_chase_alu_src(scalar, 0).def->bit_size > 32) {
/* If src is >32 bits, return max */
return max;