summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-12-20 04:36:26 +0100
committerGitHub <noreply@github.com>2019-12-20 04:36:26 +0100
commit7be65c6a688916465a7b36bab0cfc488a4481528 (patch)
tree189f8f5166de1104afd087de55c1b7dd9b33054c
parentMerge pull request #3233 from ReinUsesLisp/mismatch-sizes (diff)
parentshader/conversion: Implement byte selector in I2F (diff)
downloadyuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar.gz
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar.bz2
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar.lz
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar.xz
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.tar.zst
yuzu-7be65c6a688916465a7b36bab0cfc488a4481528.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/shader/decode/conversion.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/video_core/shader/decode/conversion.cpp b/src/video_core/shader/decode/conversion.cpp
index 32facd6ba..0eeb75559 100644
--- a/src/video_core/shader/decode/conversion.cpp
+++ b/src/video_core/shader/decode/conversion.cpp
@@ -63,12 +63,11 @@ 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.int_src.selector != 0);
UNIMPLEMENTED_IF(instr.conversion.dst_size == Register::Size::Long);
UNIMPLEMENTED_IF_MSG(instr.generates_cc,
"Condition codes generation in I2F is not implemented");
- Node value = [&]() {
+ Node value = [&] {
switch (opcode->get().GetId()) {
case OpCode::Id::I2F_R:
return GetRegister(instr.gpr20);
@@ -81,7 +80,19 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
return Immediate(0);
}
}();
+
const bool input_signed = instr.conversion.is_input_signed;
+
+ if (instr.conversion.src_size == Register::Size::Byte) {
+ const u32 offset = static_cast<u32>(instr.conversion.int_src.selector) * 8;
+ if (offset > 0) {
+ value = SignedOperation(OperationCode::ILogicalShiftRight, input_signed,
+ std::move(value), Immediate(offset));
+ }
+ } else {
+ UNIMPLEMENTED_IF(instr.conversion.int_src.selector != 0);
+ }
+
value = ConvertIntegerSize(value, instr.conversion.src_size, input_signed);
value = GetOperandAbsNegInteger(value, instr.conversion.abs_a, false, input_signed);
value = SignedOperation(OperationCode::FCastInteger, input_signed, PRECISE, value);