Mesa (staging/22.0): anv: invalidate all metadata in anv_nir_lower_ubo_loads

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 65d9aa561fc6322621e80ee44fe37bba4d35addb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=65d9aa561fc6322621e80ee44fe37bba4d35addb

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Wed Apr 13 13:09:23 2022 +0200

anv: invalidate all metadata in anv_nir_lower_ubo_loads

lower_ubo_load_instr may insert "if" blocks.

Fixes: 61749b5a151 ("anv: Add a pass for lowering A64 UBO access")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15924>
(cherry picked from commit 5bd3ba5b67f4a51bf21ea30b0a4f1c8d1551568e)

---

 .pick_status.json                          | 2 +-
 src/intel/vulkan/anv_nir_lower_ubo_loads.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 3271d485b66..cca69a48fe6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1020,7 +1020,7 @@
         "description": "anv: invalidate all metadata in anv_nir_lower_ubo_loads",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "61749b5a1513888767c39b2099be3e82f8d91871"
     },
     {
diff --git a/src/intel/vulkan/anv_nir_lower_ubo_loads.c b/src/intel/vulkan/anv_nir_lower_ubo_loads.c
index 35b963835e6..5a170352c80 100644
--- a/src/intel/vulkan/anv_nir_lower_ubo_loads.c
+++ b/src/intel/vulkan/anv_nir_lower_ubo_loads.c
@@ -119,7 +119,6 @@ bool
 anv_nir_lower_ubo_loads(nir_shader *shader)
 {
    return nir_shader_instructions_pass(shader, lower_ubo_load_instr,
-                                       nir_metadata_block_index |
-                                       nir_metadata_dominance,
+                                       nir_metadata_none,
                                        NULL);
 }