summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Nguyen Dac Nam2020-02-19 10:54:37 +0700
committerGravatar GitHub2020-02-19 10:54:37 +0700
commit556f3a6e9af4973aa72b4848b634ccf2932b614d (patch)
treed9f7186ef579b070e8c0511697f7d3b9d4109c21
parentMerge pull request #3410 from ReinUsesLisp/vk-draw-index (diff)
downloadyuzu-556f3a6e9af4973aa72b4848b634ccf2932b614d.tar.gz
yuzu-556f3a6e9af4973aa72b4848b634ccf2932b614d.tar.xz
yuzu-556f3a6e9af4973aa72b4848b634ccf2932b614d.zip
shader_conversion: add conversion I2F for Short
-rw-r--r--src/video_core/shader/decode/conversion.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/video_core/shader/decode/conversion.cpp b/src/video_core/shader/decode/conversion.cpp
index 0eeb75559..6307d1524 100644
--- a/src/video_core/shader/decode/conversion.cpp
+++ b/src/video_core/shader/decode/conversion.cpp
@@ -83,16 +83,13 @@ u32 ShaderIR::DecodeConversion(NodeBlock& bb, u32 pc) {
83 83
84 const bool input_signed = instr.conversion.is_input_signed; 84 const bool input_signed = instr.conversion.is_input_signed;
85 85
86 if (instr.conversion.src_size == Register::Size::Byte) { 86 if (const u32 offset = instr.conversion.int_src.selector; offset > 0) {
87 const u32 offset = static_cast<u32>(instr.conversion.int_src.selector) * 8; 87 ASSERT(instr.conversion.src_size == Register::Size::Byte ||
88 if (offset > 0) { 88 instr.conversion.src_size == Register::Size::Short);
89 value = SignedOperation(OperationCode::ILogicalShiftRight, input_signed, 89 value = SignedOperation(OperationCode::ILogicalShiftRight, input_signed,
90 std::move(value), Immediate(offset)); 90 std::move(value), Immediate(offset * 8));
91 }
92 } else {
93 UNIMPLEMENTED_IF(instr.conversion.int_src.selector != 0);
94 } 91 }
95 92
96 value = ConvertIntegerSize(value, instr.conversion.src_size, input_signed); 93 value = ConvertIntegerSize(value, instr.conversion.src_size, input_signed);
97 value = GetOperandAbsNegInteger(value, instr.conversion.abs_a, false, input_signed); 94 value = GetOperandAbsNegInteger(value, instr.conversion.abs_a, false, input_signed);
98 value = SignedOperation(OperationCode::FCastInteger, input_signed, PRECISE, value); 95 value = SignedOperation(OperationCode::FCastInteger, input_signed, PRECISE, value);