diff options
| author | bunnei <bunneidev@gmail.com> | 2018-09-02 16:44:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-02 16:44:13 +0200 |
| commit | 9c206fe94d306775801f16b0bba8517b72338e18 (patch) | |
| tree | c729135f498a9bb7636fca9dc63aa0478358734a | |
| parent | Merge pull request #1218 from ogniK5377/fmul-assert (diff) | |
| parent | Removed saturate assert (diff) | |
| download | yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar.gz yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar.bz2 yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar.lz yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar.xz yuzu-9c206fe94d306775801f16b0bba8517b72338e18.tar.zst yuzu-9c206fe94d306775801f16b0bba8517b72338e18.zip | |
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index c8052a612..663c1d4af 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -403,8 +403,11 @@ union Instruction { } flow; union { + BitField<47, 1, u64> cc; BitField<48, 1, u64> negate_b; BitField<49, 1, u64> negate_c; + 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 866afc7b5..e7d581d2d 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp @@ -1445,6 +1445,12 @@ private: std::string op_b = instr.ffma.negate_b ? "-" : ""; std::string op_c = instr.ffma.negate_c ? "-" : ""; + ASSERT_MSG(instr.ffma.cc == 0, "FFMA cc not implemented"); + ASSERT_MSG(instr.ffma.tab5980_0 == 1, "FFMA tab5980_0({}) not implemented", + instr.ffma.tab5980_0.Value()); // Seems to be 1 by default based on SMO + 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, |