From 30a980fb9477294c557f050feea4c39f374580b3 Mon Sep 17 00:00:00 2001 From: Marcin Ślusarz Date: Wed, 13 Apr 2022 13:15:28 +0200 Subject: 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 Reviewed-by: Jason Ekstrand Part-of: (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 93b4c24846a..1cbccf24097 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -751,7 +751,7 @@ "description": "intel/compiler: invalidate all metadata in brw_nir_lower_intersection_shader", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "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 55414f66e53..5a803cac5d0 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); -- cgit v1.2.3