summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-05-25 01:37:18 +0200
committerbunnei <bunneidev@gmail.com>2018-05-26 05:18:50 +0200
commitee53688ca77f2016b1ccb1abb5cec0c28ed00720 (patch)
treec9ab8180df5320f03b7e6669fbae66da9817e284
parentAdd & correct miscellaneous things (#470) (diff)
downloadyuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.gz
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.bz2
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.lz
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.xz
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.tar.zst
yuzu-ee53688ca77f2016b1ccb1abb5cec0c28ed00720.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h10
-rw-r--r--src/video_core/renderer_opengl/gl_shader_decompiler.cpp4
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 @@
-// Copyright 2018 yuzu Emulator Project
+// Copyright 2018 yuzu Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
@@ -315,7 +315,9 @@ public:
SHR_C,
SHR_R,
SHR_IMM,
- FMNMX,
+ FMNMX_C,
+ FMNMX_R,
+ FMNMX_IMM,
FSETP_C, // Set Predicate
FSETP_R,
FSETP_IMM,
@@ -468,7 +470,9 @@ private:
INST("0100110000101---", Id::SHR_C, Type::Arithmetic, "SHR_C"),
INST("0101110000101---", Id::SHR_R, Type::Arithmetic, "SHR_R"),
INST("0011100-00101---", Id::SHR_IMM, Type::Arithmetic, "SHR_IMM"),
- INST("0101110001100---", Id::FMNMX, Type::Arithmetic, "FMNMX"),
+ INST("0100110001100---", Id::FMNMX_C, Type::Arithmetic, "FMNMX_C"),
+ INST("0101110001100---", Id::FMNMX_R, Type::Arithmetic, "FMNMX_R"),
+ INST("0011100-01100---", Id::FMNMX_IMM, Type::Arithmetic, "FMNMX_IMM"),
INST("0100110011100---", Id::I2I_C, Type::Conversion, "I2I_C"),
INST("0101110011100---", Id::I2I_R, Type::Conversion, "I2I_R"),
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:
}
break;
}
- case OpCode::Id::FMNMX: {
+ case OpCode::Id::FMNMX_C:
+ case OpCode::Id::FMNMX_R:
+ case OpCode::Id::FMNMX_IMM: {
std::string condition =
GetPredicateCondition(instr.alu.fmnmx.pred, instr.alu.fmnmx.negate_pred != 0);
std::string parameters = op_a + ',' + op_b;