Mesa (staging/22.0): intel/compiler: invalidate all metadata in brw_nir_lower_intersection_shader

[GitLab Mirror]

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

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

intel/compiler: invalidate all metadata in brw_nir_lower_intersection_shader

New "if" blocks were inserted.

Fixes: 303378e1dd4 ("intel/rt: Add lowering for combined intersection/any-hit shaders")
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 4fddef33d5912c09677d92085911dadd60720072)

---

 .pick_status.json                                      | 2 +-
 src/intel/compiler/brw_nir_lower_intersection_shader.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index cca69a48fe6..f29699aad6a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1012,7 +1012,7 @@
         "description": "intel/compiler: invalidate all metadata in brw_nir_lower_intersection_shader",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "303378e1dd4119e04e0f6cb623766115a00c2eea"
     },
     {
diff --git a/src/intel/compiler/brw_nir_lower_intersection_shader.c b/src/intel/compiler/brw_nir_lower_intersection_shader.c
index 55924f79b19..f61012df816 100644
--- a/src/intel/compiler/brw_nir_lower_intersection_shader.c
+++ b/src/intel/compiler/brw_nir_lower_intersection_shader.c
@@ -246,6 +246,7 @@ brw_nir_lower_intersection_shader(nir_shader *intersection,
          }
       }
    }
+   nir_metadata_preserve(impl, nir_metadata_none);
 
    /* We did some inlining; have to re-index SSA defs */
    nir_index_ssa_defs(impl);