summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Ĺšlusarz <marcin.slusarz@intel.com>2022-04-13 13:15:28 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-04-21 21:03:07 -0700
commitabc89d4f39537036b47a8a286b350d775a00aba4 (patch)
tree5cd2980cb44e19973bca50991b2ce177973c3968
parentd2a21641573ab1eeb0434006152b71775f8b0460 (diff)
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@intel.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15924> (cherry picked from commit 4fddef33d5912c09677d92085911dadd60720072)
-rw-r--r--.pick_status.json2
-rw-r--r--src/intel/compiler/brw_nir_lower_intersection_shader.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index be628ca6a56..e14191784e0 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);