From a57cc0ae0c8324b5cb747d30ef0ce8cdbef6e957 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Sun, 24 Sep 2023 19:19:24 +0200 Subject: [PATCH] r600/sfn: Fix use of scheduled_shader vs shader Thanks to Vitaliy Kuzmin for pointing this out. Signed-off-by: Gert Wollny Part-of: --- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index 9a5cf65..d03116c 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -983,7 +983,7 @@ r600_shader_from_nir(struct r600_context *rctx, auto scheduled_shader = r600::schedule(shader); if (r600::sfn_log.has_debug_flag(r600::SfnLog::steps)) { std::cerr << "Shader after scheduling\n"; - shader->print(std::cerr); + scheduled_shader->print(std::cerr); } if (!r600::sfn_log.has_debug_flag(r600::SfnLog::nomerge)) { @@ -1026,7 +1026,7 @@ r600_shader_from_nir(struct r600_context *rctx, pipeshader->shader.bc.type = pipeshader->shader.processor_type; pipeshader->shader.bc.isa = rctx->isa; - pipeshader->shader.bc.ngpr = shader->required_registers(); + pipeshader->shader.bc.ngpr = scheduled_shader->required_registers(); r600::Assembler afs(&pipeshader->shader, *key); if (!afs.lower(scheduled_shader)) { -- 2.7.4