summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2018-12-26 07:18:11 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-01-15 21:54:53 +0100
commit50195b1704bcdf22d379d31b143172a32ebdfaec (patch)
tree27ec92fffda49be2aafaf2383a8a3999b40cff8c /src/video_core/renderer_opengl/gl_shader_decompiler.cpp
parentshader_decode: Use BitfieldExtract instead of shift + and (diff)
downloadyuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar.gz
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar.bz2
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar.lz
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar.xz
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.tar.zst
yuzu-50195b1704bcdf22d379d31b143172a32ebdfaec.zip
Diffstat (limited to 'src/video_core/renderer_opengl/gl_shader_decompiler.cpp')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp18
1 files changed, 8 insertions, 10 deletions
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,