octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3788 from FernandoS27/revert

Browse Source 
Revert: shader_decode: Fix LD, LDG when track constant buffer.
This commit is contained in:
bunnei
2020-04-30 12:55:39 -04:00
committed by GitHub
parent 3e9cafbee5 d8a961cd6c
commit 6572660fde
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video_core/shader/track.cpp
View File

@@ -153,21 +153,13 @@ 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; // Reduce the cursor in one to avoid infinite loops when the instruction sets the same
while (current_cursor > 0) { // register that it uses as operand
// Reduce the cursor in one to avoid infinite loops when the instruction sets the same const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1);
// register that it uses as operand if (!source) {
const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1); return {};
current_cursor = new_cursor;
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 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) {