OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600/sfn: fix cayman float instruction emission.

Browse Source 
This is enough to get glxgears working.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5084>
This commit is contained in:
Dave Airlie
2020-05-18 15:43:16 +10:00
committed by Marge Bot
parent ff9c95421a
commit 38560e0d1d
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gallium/drivers/r600/sfn/sfn_emitaluinstruction.cpp
View File

@@ -318,15 +318,31 @@ bool EmitAluInstruction::emit_alu_trans_op1(const nir_alu_instr& instr, EAluOp o
{ {
AluInstruction *ir = nullptr; AluInstruction *ir = nullptr;
std::set<int> src_idx; std::set<int> src_idx;
for (int i = 0; i < 4 ; ++i) {
if (instr.dest.write_mask & (1 << i)){ if (get_chip_class() == CAYMAN) {
int last_slot = (instr.dest.write_mask & 0x8) ? 4 : 3;
for (int i = 0; i < last_slot; ++i) {
ir = new AluInstruction(opcode, from_nir(instr.dest, i), ir = new AluInstruction(opcode, from_nir(instr.dest, i),
from_nir(instr.src[0], i), last_write); from_nir(instr.src[0], 0), instr.dest.write_mask & (1 << i) ? write : empty);
if (absolute || instr.src[0].abs) ir->set_flag(alu_src0_abs); if (absolute || instr.src[0].abs) ir->set_flag(alu_src0_abs);
if (instr.src[0].negate) ir->set_flag(alu_src0_neg); if (instr.src[0].negate) ir->set_flag(alu_src0_neg);
if (instr.dest.saturate) ir->set_flag(alu_dst_clamp); if (instr.dest.saturate) ir->set_flag(alu_dst_clamp);
if (i == (last_slot - 1)) ir->set_flag(alu_last_instr);
emit_instruction(ir); emit_instruction(ir);
} }
} else {
for (int i = 0; i < 4 ; ++i) {
if (instr.dest.write_mask & (1 << i)){
ir = new AluInstruction(opcode, from_nir(instr.dest, i),
from_nir(instr.src[0], i), last_write);
if (absolute || instr.src[0].abs) ir->set_flag(alu_src0_abs);
if (instr.src[0].negate) ir->set_flag(alu_src0_neg);
if (instr.dest.saturate) ir->set_flag(alu_dst_clamp);
emit_instruction(ir);
}
}
} }
return true; return true;
} }

5
src/gallium/drivers/r600/sfn/sfn_ir_to_assembly.cpp
View File

@@ -145,7 +145,10 @@ bool AssemblyFromShaderLegacy::do_lower(const std::vector<InstructionBlock>& ir)
else if (impl->m_bc->cf_last->op == CF_OP_CALL_FS) else if (impl->m_bc->cf_last->op == CF_OP_CALL_FS)
impl->m_bc->cf_last->op = CF_OP_NOP; impl->m_bc->cf_last->op = CF_OP_NOP;
impl->m_bc->cf_last->end_of_program = 1; if (impl->m_shader->bc.chip_class != CAYMAN)
impl->m_bc->cf_last->end_of_program = 1;
else
cm_bytecode_add_cf_end(impl->m_bc);
return true; return true;
} }