yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #3469 from namkazt/patch-1 

shader_decode: Fix LD, LDG when track constant buffer
This commit is contained in:
bunnei 2020-03-04 23:10:01 -05:00 committed by GitHub
parent 1e84d22275 85a4222a8c
commit fa1d625eed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,13 +157,21 @@ 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, cursor - 1); const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1);
current_cursor = new_cursor;
if (!source) { if (!source) {
return {}; continue;
} }
return TrackCbuf(source, code, new_cursor); const auto [base_address, index, offset] = TrackCbuf(source, code, current_cursor);
if (base_address != nullptr) {
return {base_address, index, offset};
}
}
return {};
} }
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) {