Module: Mesa Branch: staging/22.0 Commit: 3ff4eb0c1f1bcf0d0674c43b4ea92819bb21263a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3ff4eb0c1f1bcf0d0674c43b4ea92819bb21263a
Author: Marek Olšák <[email protected]> Date: Fri Apr 22 01:35:45 2022 -0400 nir: fix an uninitialized variable valgrind warning in nir_group_loads pass_flags is only initialized for grouped loads, so change the order Fixes: 33b4eb149ea - nir: add new SSA instruction scheduler grouping loads into indirection groups Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16090> (cherry picked from commit f7a77ff9005fdb1af7678d80dac6dcf16b328c21) --- .pick_status.json | 2 +- src/compiler/nir/nir_group_loads.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e4418ed0250..38a49b2d14f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -500,7 +500,7 @@ "description": "nir: fix an uninitialized variable valgrind warning in nir_group_loads", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "33b4eb149ea79d9dd4b80ddda079ad027e5a40bf" }, { diff --git a/src/compiler/nir/nir_group_loads.c b/src/compiler/nir/nir_group_loads.c index e290012437c..b9da5c325fb 100644 --- a/src/compiler/nir/nir_group_loads.c +++ b/src/compiler/nir/nir_group_loads.c @@ -428,7 +428,7 @@ process_block(nir_block *block, nir_load_grouping grouping, } /* Only group load instructions with the same indirection level. */ - if (current->pass_flags == level && is_grouped_load(current)) { + if (is_grouped_load(current) && current->pass_flags == level) { nir_instr *current_resource; switch (grouping) {
