Module: Mesa Branch: staging/23.2 Commit: e66e7caa56819eb59ae8f56b85afb5310f33617f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e66e7caa56819eb59ae8f56b85afb5310f33617f
Author: Gert Wollny <[email protected]> Date: Wed Jul 19 17:27:19 2023 +0200 r600/sfn: remove debug output leftovers Fixes: ae7d904a73b57f6f019346b3926cde5263bff787 r600/sfn: Implement source mod optimization in backend Signed-off-by: Gert Wollny <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24239> (cherry picked from commit 59087003c4b7a4f5a6bf207f214a4c3443b9759f) --- .pick_status.json | 2 +- src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d227189a1cb..ca4ea0ec3aa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4,7 +4,7 @@ "description": "r600/sfn: remove debug output leftovers", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ae7d904a73b57f6f019346b3926cde5263bff787", "notes": null diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp index f7697c0ac64..3f84d0bf918 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_instr_alu.cpp @@ -474,10 +474,8 @@ bool AluInstr::replace_src(int i, PVirtualValue new_src, uint32_t to_set, auto old_src = m_src[i]->as_register(); assert(old_src); - if (!can_replace_source(old_src, new_src)) { - std::cerr << "Can't replace src " << *old_src << " with " << *new_src << "\n"; + if (!can_replace_source(old_src, new_src)) return false; - } assert(old_src); old_src->del_use(this);
