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

pco: Amend errant nir_move_option

Browse source 
Move options were bit or-ing from the wrong enum, causing undefined
behaviour when the number of intrinsics changed.
Replaced it with the values from the right nir_move_options enum that
were previously working. (Further refinement needed on these after
extensive testing.)

Fixes: f1b24267d2 ("pco: rework nir processing and passes")
Signed-off-by: Radu Costas <radu.costas@imgtec.com>
Reviewed-by: Simon Perretta <simon.perretta@imgtec.com>
(cherry picked from commit 721c1b8f65)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
This commit is contained in:
Radu Costas 2026-03-23 14:37:43 +02:00 • committed by Eric Engestrom
parent 9c45a18af7
commit 9257997e3e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3374,7 +3374,7 @@
"description": "pco: Amend errant nir_move_option",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f1b24267d25bcf3a29228b705a253a6c4b40b8af",
"notes": null

5
src/imagination/pco/pco_nir.c
View file

@ -827,8 +827,9 @@ void pco_lower_nir(pco_ctx *ctx, nir_shader *nir, pco_data *data)
nir_move_options move_options = nir_move_load_global | nir_move_load_ubo |
nir_move_load_ssbo | nir_move_load_input |
nir_move_load_frag_coord |
nir_intrinsic_load_uniform;
nir_move_load_frag_coord | nir_move_alu |
nir_move_comparisons | nir_move_copies;
NIR_PASS(_, nir, nir_opt_sink, move_options);
NIR_PASS(_, nir, nir_opt_move, move_options);