From ac2c3fb010c00716444e3d7b4381b29afbc92cd4 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Wed, 6 May 2020 23:55:56 +0200 Subject: [PATCH] r600/sfn: Fix handling of output register index Signed-off-by: Gert Wollny Reviewed-by: Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/r600/sfn/sfn_shader_base.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp index 57053efc49a..2e65d8dafb2 100644 --- a/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp @@ -988,10 +988,10 @@ void ShaderFromNirProcessor::set_input(unsigned pos, PValue var) m_inputs[pos] = var; } -void ShaderFromNirProcessor::set_output(unsigned pos, PValue var) +void ShaderFromNirProcessor::set_output(unsigned pos, int sel) { - r600::sfn_log << SfnLog::io << "Set output[" << pos << "] =" << *var << "\n"; - m_outputs[pos] = var; + r600::sfn_log << SfnLog::io << "Set output[" << pos << "] =" << sel << "\n"; + m_outputs[pos] = sel; } void ShaderFromNirProcessor::append_block(int nesting_change) @@ -1008,7 +1008,7 @@ void ShaderFromNirProcessor::finalize() m_sh_info.input[i.first].gpr = i.second->sel(); for (auto& i : m_outputs) - m_sh_info.output[i.first].gpr = i.second->sel(); + m_sh_info.output[i.first].gpr = i.second; m_output.push_back(m_export_output); } -- 2.30.2