summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-08-11 23:00:14 +0200
committerSubv <subv2112@gmail.com>2018-08-11 23:00:14 +0200
commitc1ad9738810d312ec38beccd709ce0853641a94a (patch)
tree999f11d3e815983d173e7db2d408f03762f39f51
parentGPU/Shaders: Implemented SSY and SYNC as a way to modify control flow during shader execution. (diff)
downloadyuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar.gz
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar.bz2
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar.lz
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar.xz
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.tar.zst
yuzu-c1ad9738810d312ec38beccd709ce0853641a94a.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h7
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp8
2 files changed, 13 insertions, 2 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 3d4557b7e..42c6ea5fd 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -598,6 +598,13 @@ public:
Unknown,
};
+ /// Returns whether an opcode has an execution predicate field or not (ie, whether it can be
+ /// conditionally executed).
+ static bool IsPredicatedInstruction(Id opcode) {
+ // TODO(Subv): Add the rest of unpredicated instructions.
+ return opcode != Id::SSY;
+ }
+
class Matcher {
public:
Matcher(const char* const name, u16 mask, u16 expected, OpCode::Id id, OpCode::Type type)
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 532a47037..8954deb81 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -837,7 +837,11 @@ private:
ASSERT_MSG(instr.pred.full_pred != Pred::NeverExecute,
"NeverExecute predicate not implemented");
- if (instr.pred.pred_index != static_cast<u64>(Pred::UnusedIndex)) {
+ // Some instructions (like SSY) don't have a predicate field, they are always
+ // unconditionally executed.
+ bool can_be_predicated = OpCode::IsPredicatedInstruction(opcode->GetId());
+
+ if (can_be_predicated && instr.pred.pred_index != static_cast<u64>(Pred::UnusedIndex)) {
shader.AddLine("if (" +
GetPredicateCondition(instr.pred.pred_index, instr.negate_pred != 0) +
')');
@@ -1709,7 +1713,7 @@ private:
}
// Close the predicate condition scope.
- if (instr.pred.pred_index != static_cast<u64>(Pred::UnusedIndex)) {
+ if (can_be_predicated && instr.pred.pred_index != static_cast<u64>(Pred::UnusedIndex)) {
--shader.scope;
shader.AddLine('}');
}