summaryrefslogtreecommitdiffstats
path: root/src/video_core/engines
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-06-17 18:49:34 +0200
committerbunnei <bunneidev@gmail.com>2018-06-17 19:31:39 +0200
commit5673ce39c71ead786e207fd70abd8f83d51024e0 (patch)
treec25ee5e19263821ebb0a850a99af99b2d6ccf0cc /src/video_core/engines
parentMerge pull request #565 from bunnei/shader_conversions (diff)
downloadyuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar.gz
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar.bz2
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar.lz
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar.xz
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.tar.zst
yuzu-5673ce39c71ead786e207fd70abd8f83d51024e0.zip
Diffstat (limited to 'src/video_core/engines')
-rw-r--r--src/video_core/engines/shader_bytecode.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index ceef8087c..800b70dbf 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -233,7 +233,7 @@ union Instruction {
BitField<53, 2, LogicOperation> operation;
BitField<55, 1, u64> invert_a;
BitField<56, 1, u64> invert_b;
- } lop;
+ } lop32i;
float GetImm20_19() const {
float result{};
@@ -518,7 +518,6 @@ public:
ArithmeticInteger,
ArithmeticIntegerImmediate,
Bfe,
- Logic,
Shift,
Ffma,
Flow,
@@ -676,7 +675,7 @@ private:
INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"),
INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"),
INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"),
- INST("000001----------", Id::LOP32I, Type::Logic, "LOP32I"),
+ INST("000001----------", Id::LOP32I, Type::ArithmeticIntegerImmediate, "LOP32I"),
INST("0100110001001---", Id::SHL_C, Type::Shift, "SHL_C"),
INST("0101110001001---", Id::SHL_R, Type::Shift, "SHL_R"),
INST("0011100-01001---", Id::SHL_IMM, Type::Shift, "SHL_IMM"),