From 6c0c2dfabce6ebef401321c2fa7879e291690b39 Mon Sep 17 00:00:00 2001 From: Nguyen Dac Nam Date: Fri, 28 Feb 2020 11:59:05 +0700 Subject: shader_decode: Fix LD, LDG when track constant buffer --- src/video_core/shader/track.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/shader/track.cpp b/src/video_core/shader/track.cpp index face8c943..a113a5868 100644 --- a/src/video_core/shader/track.cpp +++ b/src/video_core/shader/track.cpp @@ -159,11 +159,19 @@ std::tuple ShaderIR::TrackCbuf(Node tracked, const NodeBlock& co } // Reduce the cursor in one to avoid infinite loops when the instruction sets the same // register that it uses as operand - const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1); - if (!source) { - return {}; + s64 current_cursor = cursor; + while (current_cursor > 0) { + const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1); + 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 TrackCbuf(source, code, new_cursor); + return {}; } if (const auto operation = std::get_if(&*tracked)) { for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) { -- cgit v1.2.3 From 85a4222a8cb6facc92008b4c7db7dc387d4bad76 Mon Sep 17 00:00:00 2001 From: Nguyen Dac Nam Date: Sat, 29 Feb 2020 13:50:10 +0700 Subject: nit: move comment to right place. --- src/video_core/shader/track.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video_core') diff --git a/src/video_core/shader/track.cpp b/src/video_core/shader/track.cpp index a113a5868..15e22b9fa 100644 --- a/src/video_core/shader/track.cpp +++ b/src/video_core/shader/track.cpp @@ -157,10 +157,10 @@ std::tuple ShaderIR::TrackCbuf(Node tracked, const NodeBlock& co if (gpr->GetIndex() == Tegra::Shader::Register::ZeroIndex) { return {}; } - // Reduce the cursor in one to avoid infinite loops when the instruction sets the same - // register that it uses as operand s64 current_cursor = cursor; while (current_cursor > 0) { + // Reduce the cursor in one to avoid infinite loops when the instruction sets the same + // register that it uses as operand const auto [source, new_cursor] = TrackRegister(gpr, code, current_cursor - 1); current_cursor = new_cursor; if (!source) { -- cgit v1.2.3