diff options
author | Marcin Ĺšlusarz <marcin.slusarz@intel.com> | 2022-04-13 13:15:28 +0200 |
---|---|---|
committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-20 21:44:50 -0700 |
commit | 30a980fb9477294c557f050feea4c39f374580b3 (patch) | |
tree | d89ec6252300082ede2eff9310fcc14116bae2c1 | |
parent | 4f031f35fef27c0cbe83ed44e8eb6e882cccd918 (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.json | 2 | ||||
-rw-r--r-- | src/intel/compiler/brw_nir_lower_intersection_shader.c | 1 |
2 files changed, 2 insertions, 1 deletions
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); |