fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600/sfn: Fix using the result of a fetch instruction in next fetch

Browse source 
The result of a fetch instruction can't be used as source in the same CF
block, so force a new CF block when the result would be used in the same
vertex fetch block.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4609>
This commit is contained in:
Gert Wollny 2020-04-12 16:51:07 +02:00 • committed by Marge Bot
parent 67495ff9aa
commit 9c7ce4d76e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/r600/sfn/sfn_ir_to_assembly.cpp
View file

@ -88,6 +88,7 @@ public:
PValue m_last_addr;
int m_loop_nesting;
int m_nliterals_in_group;
std::set<int> vtx_fetch_results;
};
@ -147,6 +148,9 @@ bool AssemblyFromShaderLegacy::do_lower(const std::vector<InstructionBlock>& ir)
bool AssemblyFromShaderLegacyImpl::emit(const Instruction::Pointer i)
{
if (i->type() != Instruction::vtx)
vtx_fetch_results.clear();
sfn_log << SfnLog::assembly << "Emit from '" << *i << "\n";
switch (i->type()) {
case Instruction::alu:
@ -740,6 +744,13 @@ bool AssemblyFromShaderLegacyImpl::emit_vtx(const FetchInstruction& fetch_instr)
}
}
if (vtx_fetch_results.find(fetch_instr.src().sel()) !=
vtx_fetch_results.end()) {
m_bc->force_add_cf = 1;
vtx_fetch_results.clear();
}
vtx_fetch_results.insert(fetch_instr.dst().sel());
struct r600_bytecode_vtx vtx;
memset(&vtx, 0, sizeof(vtx));
vtx.op = fetch_instr.vc_opcode();