summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-08-28 04:39:38 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-08-28 04:40:40 +0200
commitb13fbc25b8c0b7abdac52d481abbc5ba58166aca (patch)
tree4ceb0088160f4ce3a8ca5cef566ca8c672025867
parentMerge pull request #2748 from FernandoS27/align-memory (diff)
downloadyuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar.gz
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar.bz2
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar.lz
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar.xz
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.tar.zst
yuzu-b13fbc25b8c0b7abdac52d481abbc5ba58166aca.zip
-rw-r--r--src/video_core/engines/shader_bytecode.h3
-rw-r--r--src/video_core/shader/decode/conversion.cpp20
2 files changed, 17 insertions, 6 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h
index aaa1acea9..35201c8be 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -1006,7 +1006,7 @@ union Instruction {
} iset;
union {
- BitField<41, 2, u64> selector; // i2i and i2f only
+ BitField<41, 2, u64> selector;
BitField<45, 1, u64> negate_a;
BitField<49, 1, u64> abs_a;
BitField<10, 2, Register::Size> src_size;
@@ -1031,7 +1031,6 @@ union Instruction {
return static_cast<F2fRoundingOp>(rounding.Value() & rounding_mask);
}
} f2f;
-
} conversion;
union {
diff --git a/src/video_core/shader/decode/conversion.cpp b/src/video_core/shader/decode/conversion.cpp
index 8973fbefa..cf328aff8 100644
--- a/src/video_core/shader/decode/conversion.cpp
+++ b/src/video_core/shader/decode/conversion.cpp
@@ -22,7 +22,7 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
case OpCode::Id::I2I_R:
case OpCode::Id::I2I_C:
case OpCode::Id::I2I_IMM: {
- UNIMPLEMENTED_IF(instr.conversion.selector);
+ UNIMPLEMENTED_IF(instr.conversion.selector.Value());
UNIMPLEMENTED_IF(instr.conversion.dst_size != Register::Size::Word);
UNIMPLEMENTED_IF(instr.alu.saturate_d);
@@ -57,8 +57,8 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
case OpCode::Id::I2F_R:
case OpCode::Id::I2F_C:
case OpCode::Id::I2F_IMM: {
+ UNIMPLEMENTED_IF(instr.conversion.selector.Value());
UNIMPLEMENTED_IF(instr.conversion.dst_size == Register::Size::Long);
- UNIMPLEMENTED_IF(instr.conversion.selector);
UNIMPLEMENTED_IF_MSG(instr.generates_cc,
"Condition codes generation in I2F is not implemented");
@@ -93,6 +93,7 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
case OpCode::Id::F2F_R:
case OpCode::Id::F2F_C:
case OpCode::Id::F2F_IMM: {
+ UNIMPLEMENTED_IF(instr.conversion.selector.Value());
UNIMPLEMENTED_IF(instr.conversion.dst_size == Register::Size::Long);
UNIMPLEMENTED_IF(instr.conversion.src_size == Register::Size::Long);
UNIMPLEMENTED_IF_MSG(instr.generates_cc,
@@ -169,8 +170,19 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
}();
if (instr.conversion.src_size == Register::Size::Short) {
- // TODO: figure where extract is sey in the encoding
- value = Operation(OperationCode::FCastHalf0, PRECISE, value);
+ const OperationCode cast = [instr] {
+ switch (instr.conversion.selector) {
+ case 0:
+ return OperationCode::FCastHalf0;
+ case 1:
+ return OperationCode::FCastHalf1;
+ default:
+ UNREACHABLE_MSG("Invalid selector={}",
+ static_cast<u32>(instr.conversion.selector));
+ return OperationCode::FCastHalf0;
+ }
+ }();
+ value = Operation(cast, NO_PRECISE, std::move(value));
}
value = GetOperandAbsNegFloat(value, instr.conversion.abs_a, instr.conversion.negate_a);