Module: Mesa Branch: staging/22.0 Commit: 891a34bcb2e218ac4b53c6da7ab5e70553d8d83a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=891a34bcb2e218ac4b53c6da7ab5e70553d8d83a
Author: Lionel Landwerlin <[email protected]> Date: Thu Apr 21 11:00:23 2022 +0300 nir/divergence: handle load_global_block_intel Signed-off-by: Lionel Landwerlin <[email protected]> Fixes: dd39e311b336 ("nir: Add nir_intrinsic_{load,store}_deref_block_intel") Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16075> (cherry picked from commit 9f44a264623461c98368185b023d99446676e039) Conflicts: src/compiler/nir/nir_divergence_analysis.c --- .pick_status.json | 2 +- src/compiler/nir/nir_divergence_analysis.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1b4a6542c42..3448596a15d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -204,7 +204,7 @@ "description": "nir/divergence: handle load_global_block_intel", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "because_sha": "dd39e311b336dddcc7343c5119ce05af410d8dc5" }, { diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 58ed99ea2d5..fdf8d695461 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -158,6 +158,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr) case nir_intrinsic_load_user_data_amd: case nir_intrinsic_load_tess_level_inner_default: case nir_intrinsic_load_tess_level_outer_default: + case nir_intrinsic_load_global_block_intel: is_divergent = false; break;
