From 50195b1704bcdf22d379d31b143172a32ebdfaec Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 26 Dec 2018 03:18:11 -0300
Subject: shader_decode: Use proper primitive names

---
 .../renderer_opengl/gl_shader_decompiler.cpp           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/video_core/renderer_opengl')

diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 60b11df51..ceb54ec2c 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -325,8 +325,8 @@ private:
             }
 
             ASSERT(element.second.size() > 0);
-            // UNIMPLEMENTED_IF_MSG(element.second.size() > 1,
-            //                     "Multiple input flag modes are not supported in GLSL");
+            UNIMPLEMENTED_IF_MSG(element.second.size() > 1,
+                                 "Multiple input flag modes are not supported in GLSL");
 
             // TODO(bunnei): Use proper number of elements for these
             u32 idx = static_cast<u32>(index) - static_cast<u32>(Attribute::Index::Attribute_0);
@@ -1209,7 +1209,7 @@ private:
         return expr;
     }
 
-    std::string Bra(Operation operation) {
+    std::string Branch(Operation operation) {
         const auto target = std::get<ImmediateNode>(*operation[0]);
         code.AddLine(fmt::format("jmp_to = 0x{:x}u;", target.GetValue()));
         code.AddLine("break;");
@@ -1289,7 +1289,7 @@ private:
         return {};
     }
 
-    std::string Kil(Operation operation) {
+    std::string Discard(Operation operation) {
         // Enclose "discard" in a conditional, so that GLSL compilation does not complain
         // about unexecuted instructions that may follow this.
         code.AddLine("if (true) {");
@@ -1449,13 +1449,11 @@ private:
         &GLSLDecompiler::F4TextureQueryLod,
         &GLSLDecompiler::F4TexelFetch,
 
-        &GLSLDecompiler::Bra,
-        &GLSLDecompiler::PushFlowStack, // Ssy
-        &GLSLDecompiler::PushFlowStack, // Brk
-        &GLSLDecompiler::PopFlowStack,  // Sync
-        &GLSLDecompiler::PopFlowStack,  // Brk
+        &GLSLDecompiler::Branch,
+        &GLSLDecompiler::PushFlowStack,
+        &GLSLDecompiler::PopFlowStack,
         &GLSLDecompiler::Exit,
-        &GLSLDecompiler::Kil,
+        &GLSLDecompiler::Discard,
 
         &GLSLDecompiler::EmitVertex,
         &GLSLDecompiler::EndPrimitive,
-- 
cgit v1.2.3