summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader/track.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-03-05 05:10:01 +0100
committerGitHub <noreply@github.com>2020-03-05 05:10:01 +0100
commitfa1d625eed5803e3b93ed5d848e8a241cbf37202 (patch)
treef70d7e8e72ac421966df9ffd21c326f77b5a4a01 /src/video_core/shader/track.cpp
parentMerge pull request #3478 from bunnei/a32 (diff)
parentnit: move comment to right place. (diff)
downloadyuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar.gz
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar.bz2
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar.lz
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar.xz
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.tar.zst
yuzu-fa1d625eed5803e3b93ed5d848e8a241cbf37202.zip
Diffstat (limited to 'src/video_core/shader/track.cpp')
-rw-r--r--src/video_core/shader/track.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/src/video_core/shader/track.cpp b/src/video_core/shader/track.cpp
index face8c943..15e22b9fa 100644
--- a/src/video_core/shader/track.cpp
+++ b/src/video_core/shader/track.cpp
@@ -157,13 +157,21 @@ std::tuple<Node, u32, u32> 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
- const auto [source, new_cursor] = TrackRegister(gpr, code, cursor - 1);
- if (!source) {
- return {};
+ 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) {
+ 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<OperationNode>(&*tracked)) {
for (std::size_t i = operation->GetOperandsCount(); i > 0; --i) {