yuzu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline.git synced 2024-12-24 02:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GPU/Shader: Don't predicate instructions that don't have a predicate field (SSY).

Browse source
This commit is contained in:
Subv 2018-08-11 16:00:14 -05:00
parent 305a05f820
commit c1ad973881
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/video_core/engines/shader_bytecode.h
View file

@ -598,6 +598,13 @@ public:
Unknown, 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 { class Matcher {
public: public:
Matcher(const char* const name, u16 mask, u16 expected, OpCode::Id id, OpCode::Type type) Matcher(const char* const name, u16 mask, u16 expected, OpCode::Id id, OpCode::Type type)

8
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -837,7 +837,11 @@ private:
ASSERT_MSG(instr.pred.full_pred != Pred::NeverExecute, ASSERT_MSG(instr.pred.full_pred != Pred::NeverExecute,
"NeverExecute predicate not implemented"); "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 (" + shader.AddLine("if (" +
GetPredicateCondition(instr.pred.pred_index, instr.negate_pred != 0) + GetPredicateCondition(instr.pred.pred_index, instr.negate_pred != 0) +
')'); ')');
@ -1709,7 +1713,7 @@ private:
} }
// Close the predicate condition scope. // 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.scope;
shader.AddLine('}'); shader.AddLine('}');
} }