summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-09-01 10:45:14 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2018-09-01 10:45:14 +0200
commitb89fc407d78867119074ffc9c98eb0d0806be6a8 (patch)
tree26cb205263355eb0d52a01e3b9a1a0cd8b995b89
parentMerge pull request #1196 from FearlessTobi/ccache-consistency (diff)
downloadyuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar.gz
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar.bz2
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar.lz
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar.xz
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.tar.zst
yuzu-b89fc407d78867119074ffc9c98eb0d0806be6a8.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h4
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp7
2 files changed, 11 insertions, 0 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index 3e4efbe0c..f17a24843 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -399,8 +399,12 @@ union Instruction {
} flow;
union {
+ BitField<47, 1, u64> cc;
BitField<48, 1, u64> negate_b;
BitField<49, 1, u64> negate_c;
+ BitField<50, 1, u64> saturate;
+ BitField<51, 2, u64> tab5980_1;
+ BitField<53, 2, u64> tab5980_0;
} ffma;
union {
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
index 391c92d47..88b4e4324 100644
--- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp
@@ -1436,6 +1436,13 @@ private:
std::string op_b = instr.ffma.negate_b ? "-" : "";
std::string op_c = instr.ffma.negate_c ? "-" : "";
+ ASSERT_MSG(instr.ffma.saturate == 0, "FFMA Saturate not implemented");
+ ASSERT_MSG(instr.ffma.cc == 0, "FFMA cc not implemented");
+ ASSERT_MSG(instr.ffma.tab5980_0 == 0, "FFMA tab5980_0({}) not implemented",
+ instr.ffma.tab5980_0.Value());
+ ASSERT_MSG(instr.ffma.tab5980_1 == 0, "FFMA tab5980_1({}) not implemented",
+ instr.ffma.tab5980_1.Value());
+
switch (opcode->GetId()) {
case OpCode::Id::FFMA_CR: {
op_b += regs.GetUniform(instr.cbuf34.index, instr.cbuf34.offset,