summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-06-09 05:46:10 +0200
committerSubv <subv2112@gmail.com>2018-06-09 05:46:10 +0200
commitabec5f82e288fb537f11b4b8a29021fe2d6b7b65 (patch)
treeac4e4535699fa3f8719f6cc3b64f624dad253311
parentMerge pull request #505 from janisozaur/ccache-travis (diff)
downloadyuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar.gz
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar.bz2
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar.lz
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar.xz
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.tar.zst
yuzu-abec5f82e288fb537f11b4b8a29021fe2d6b7b65.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h2
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 32800392b..6cc442786 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -410,6 +410,7 @@ class OpCode {
public:
enum class Id {
KIL,
+ SSY,
BFE_C,
BFE_R,
BFE_IMM,
@@ -596,6 +597,7 @@ private:
std::vector<Matcher> table = {
#define INST(bitstring, op, type, name) Detail::GetMatcher(bitstring, op, type, name)
INST("111000110011----", Id::KIL, Type::Flow, "KIL"),
+ INST("111000101001----", Id::SSY, Type::Flow, "SSY"),
INST("111000100100----", Id::BRA, Type::Flow, "BRA"),
INST("1110111111011---", Id::LD_A, Type::Memory, "LD_A"),
INST("1110111110010---", Id::LD_C, Type::Memory, "LD_C"),
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 94c6bc4b2..033711b66 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1435,6 +1435,11 @@ private:
regs.SetRegisterToInputAttibute(instr.gpr0, attribute.element, attribute.index);
break;
}
+ case OpCode::Id::SSY: {
+ // The SSY opcode tells the GPU where to re-converge divergent execution paths, we
+ // can ignore this when generating GLSL code.
+ break;
+ }
default: {
NGLOG_CRITICAL(HW_GPU, "Unhandled instruction: {}", opcode->GetName());
UNREACHABLE();