diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2022-11-16 17:36:19 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-11-21 09:46:52 -0800 |
| commit | 1f39b0c57c05d5038881d46e859691d0dd7be429 (patch) | |
| tree | 45b5a4f0074fa6b752d88806869d45e551c13f15 | |
| parent | 094dffac9cb997baeaddef2ab66fdc1814c7d1a7 (diff) | |
| download | mesa-1f39b0c57c05d5038881d46e859691d0dd7be429.tar.gz | |
nir/lower_shader_calls: update metadata before validation
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19820>
(cherry picked from commit 96d84e2a77568e27af6fac90bd0ab81d932eecbd)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_shader_calls.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index 818528efa9b..cf8bea1c6a3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -769,7 +769,7 @@ "description": "nir/lower_shader_calls: update metadata before validation", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/compiler/nir/nir_lower_shader_calls.c b/src/compiler/nir/nir_lower_shader_calls.c index d68a4396929..30882d3358a 100644 --- a/src/compiler/nir/nir_lower_shader_calls.c +++ b/src/compiler/nir/nir_lower_shader_calls.c @@ -1085,11 +1085,11 @@ lower_resume(nir_shader *shader, int call_idx) ralloc_free(mem_ctx); + nir_metadata_preserve(impl, nir_metadata_none); + nir_validate_shader(shader, "after flatten_resume_if_ladder in " "brw_nir_lower_shader_calls"); - nir_metadata_preserve(impl, nir_metadata_none); - return resume_instr; } |