diff --git a/.pick_status.json b/.pick_status.json index a6066e95a75..3ae37597581 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);