CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert: shader_decode: Fix LD, LDG when track constant buffer.

merge-requests/60/head
Fernando Sahmkow 2020-04-24 11:00:54 +07:00
parent ff0c49e1ce
commit d8a961cd6c
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video_core/shader/track.cpp
Unescape Escape View File

@ -153,22 +153,14 @@ std::tuple<Node, u32, u32> ShaderIR::TrackCbuf(Node tracked, const NodeBlock& co
if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) { if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) {
return {}; return {};
} }
s64 current_cursor = cursor;
while (current_cursor > 0) {
// Reduce the cursor in one to avoid infinite loops when the instruction sets the same // Reduce the cursor in one to avoid infinite loops when the instruction sets the same
// register that it uses as operand // register that it uses as operand
const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1); const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1);
current_cursor = new_cursor;
if (!source) { if (!source) {
continue;
}
const auto [base_address, index, offset] = TrackCbuf(source, code, current_cursor);
if (base_address != nullptr) {
return {base_address, index, offset};
}
}
return {}; return {};
} }
return TrackCbuf(source, code, new_cursor);
}
if (const auto operation = std::get_if<OperationNode>(&*tracked)) { if (const auto operation = std::get_if<OperationNode>(&*tracked)) {
for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) { for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) {
if (auto found = TrackCbuf((*operation)[i - 1], code, cursor); std::get<0>(found)) { if (auto found = TrackCbuf((*operation)[i - 1], code, cursor); std::get<0>(found)) {