summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-06 21:56:14 -0500
committerGravatar GitHub2019-02-06 21:56:14 -0500
commitf09d1dffd16ab857d6cf75b862aa0b01777e5673 (patch)
tree8d99905781788745e7a058cdb844964bbc15eba4 /src/video_core/renderer_opengl
parentMerge pull request #2091 from FearlessTobi/port-4603 (diff)
parentshader/track: Search inside of conditional nodes (diff)
downloadyuzu-f09d1dffd16ab857d6cf75b862aa0b01777e5673.tar.gz
yuzu-f09d1dffd16ab857d6cf75b862aa0b01777e5673.tar.xz
yuzu-f09d1dffd16ab857d6cf75b862aa0b01777e5673.zip
Merge pull request #2083 from ReinUsesLisp/shader-ir-cbuf-tracking
shader/track: Add a more permissive global memory tracking
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index d84caa6db..70e124dc4 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -171,7 +171,7 @@ public:
171 code.AddLine(fmt::format("case 0x{:x}u: {{", address)); 171 code.AddLine(fmt::format("case 0x{:x}u: {{", address));
172 ++code.scope; 172 ++code.scope;
173 173
174 VisitBasicBlock(bb); 174 VisitBlock(bb);
175 175
176 --code.scope; 176 --code.scope;
177 code.AddLine('}'); 177 code.AddLine('}');
@@ -423,7 +423,7 @@ private:
423 code.AddNewLine(); 423 code.AddNewLine();
424 } 424 }
425 425
426 void VisitBasicBlock(const BasicBlock& bb) { 426 void VisitBlock(const NodeBlock& bb) {
427 for (const Node node : bb) { 427 for (const Node node : bb) {
428 if (const std::string expr = Visit(node); !expr.empty()) { 428 if (const std::string expr = Visit(node); !expr.empty()) {
429 code.AddLine(expr); 429 code.AddLine(expr);
@@ -575,7 +575,7 @@ private:
575 code.AddLine("if (" + Visit(conditional->GetCondition()) + ") {"); 575 code.AddLine("if (" + Visit(conditional->GetCondition()) + ") {");
576 ++code.scope; 576 ++code.scope;
577 577
578 VisitBasicBlock(conditional->GetCode()); 578 VisitBlock(conditional->GetCode());
579 579
580 --code.scope; 580 --code.scope;
581 code.AddLine('}'); 581 code.AddLine('}');