From 2ea6e67dcf1aa2c9397c6c06fb366b6af3232248 Mon Sep 17 00:00:00 2001 From: Patrick Lerda Date: Fri, 21 Mar 2025 14:26:18 +0100 Subject: [PATCH] r600: add r600_lower_tess_io metadata compatibility ../src/compiler/nir/nir_metadata.c:172: nir_metadata_check_validation_flag: Assertion `!(impl->valid_metadata & nir_metadata_not_properly_reset)' failed. Signed-off-by: Patrick Lerda Part-of: --- src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp index c7b8e0ba939..953c20c812d 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir_lower_tess_io.cpp @@ -421,14 +421,15 @@ r600_lower_tess_io(nir_shader *shader, enum mesa_prim prim_type) nir_foreach_block(block, impl) { - nir_foreach_instr_safe(instr, block) - { + bool progress_impl = false; + nir_foreach_instr_safe (instr, block) { if (instr->type != nir_instr_type_intrinsic) continue; if (r600_lower_tess_io_filter(instr, shader->info.stage)) - progress |= r600_lower_tess_io_impl(&b, instr, prim_type); + progress_impl |= r600_lower_tess_io_impl(&b, instr, prim_type); } + progress |= nir_progress(progress_impl, impl, nir_metadata_control_flow); } } return progress;