diff options
| author | 2018-05-24 19:37:18 -0400 | |
|---|---|---|
| committer | 2018-05-25 23:18:50 -0400 | |
| commit | ee53688ca77f2016b1ccb1abb5cec0c28ed00720 (patch) | |
| tree | c9ab8180df5320f03b7e6669fbae66da9817e284 /src | |
| parent | Add & correct miscellaneous things (#470) (diff) | |
| download | yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.gz yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.xz yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.zip | |
shader_bytecode: Implement other variants of FMNMX.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 10 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 8ea26c9c1..d75de85e2 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright 2018 yuzu Emulator Project | 1 | // Copyright 2018 yuzu Emulator Project |
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| @@ -315,7 +315,9 @@ public: | |||
| 315 | SHR_C, | 315 | SHR_C, |
| 316 | SHR_R, | 316 | SHR_R, |
| 317 | SHR_IMM, | 317 | SHR_IMM, |
| 318 | FMNMX, | 318 | FMNMX_C, |
| 319 | FMNMX_R, | ||
| 320 | FMNMX_IMM, | ||
| 319 | FSETP_C, // Set Predicate | 321 | FSETP_C, // Set Predicate |
| 320 | FSETP_R, | 322 | FSETP_R, |
| 321 | FSETP_IMM, | 323 | FSETP_IMM, |
| @@ -468,7 +470,9 @@ private: | |||
| 468 | INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"), | 470 | INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"), |
| 469 | INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"), | 471 | INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"), |
| 470 | INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"), | 472 | INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"), |
| 471 | INST("0101110001100---", Id::FMNMX, Type::Arithmetic, "FMNMX"), | 473 | INST("0100110001100---", Id::FMNMX_C, Type::Arithmetic, "FMNMX_C"), |
| 474 | INST("0101110001100---", Id::FMNMX_R, Type::Arithmetic, "FMNMX_R"), | ||
| 475 | INST("0011100-01100---", Id::FMNMX_IMM, Type::Arithmetic, "FMNMX_IMM"), | ||
| 472 | INST("0100110011100---", Id::I2I_C, Type::Conversion, "I2I_C"), | 476 | INST("0100110011100---", Id::I2I_C, Type::Conversion, "I2I_C"), |
| 473 | INST("0101110011100---", Id::I2I_R, Type::Conversion, "I2I_R"), | 477 | INST("0101110011100---", Id::I2I_R, Type::Conversion, "I2I_R"), |
| 474 | INST("01110001-1000---", Id::I2I_IMM, Type::Conversion, "I2I_IMM"), | 478 | INST("01110001-1000---", Id::I2I_IMM, Type::Conversion, "I2I_IMM"), |
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index d24b1ab44..bd22b3a41 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |||
| @@ -775,7 +775,9 @@ private: | |||
| 775 | } | 775 | } |
| 776 | break; | 776 | break; |
| 777 | } | 777 | } |
| 778 | case OpCode::Id::FMNMX: { | 778 | case OpCode::Id::FMNMX_C: |
| 779 | case OpCode::Id::FMNMX_R: | ||
| 780 | case OpCode::Id::FMNMX_IMM: { | ||
| 779 | std::string condition = | 781 | std::string condition = |
| 780 | GetPredicateCondition(instr.alu.fmnmx.pred, instr.alu.fmnmx.negate_pred != 0); | 782 | GetPredicateCondition(instr.alu.fmnmx.pred, instr.alu.fmnmx.negate_pred != 0); |
| 781 | std::string parameters = op_a + ',' + op_b; | 783 | std::string parameters = op_a + ',' + op_b; |