summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNguyen Dac Nam <nam.kazt.91@gmail.com>2020-03-13 13:01:49 +0100
committerGitHub <noreply@github.com>2020-03-13 13:01:49 +0100
commita16621748028057aa78ddd71ea8e478162212073 (patch)
treef0ece9a49a60afc39bf26dff80057c5123585f5a /src
parentMerge pull request #3483 from namkazt/patch-1 (diff)
downloadyuzu-a16621748028057aa78ddd71ea8e478162212073.tar
yuzu-a16621748028057aa78ddd71ea8e478162212073.tar.gz
yuzu-a16621748028057aa78ddd71ea8e478162212073.tar.bz2
yuzu-a16621748028057aa78ddd71ea8e478162212073.tar.lz
yuzu-a16621748028057aa78ddd71ea8e478162212073.tar.xz
yuzu-a16621748028057aa78ddd71ea8e478162212073.tar.zst
yuzu-a16621748028057aa78ddd71ea8e478162212073.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/decode/xmad.cpp50
1 files changed, 41 insertions, 9 deletions
diff --git a/src/video_core/shader/decode/xmad.cpp b/src/video_core/shader/decode/xmad.cpp
index 206961909..61d23649d 100644
--- a/src/video_core/shader/decode/xmad.cpp
+++ b/src/video_core/shader/decode/xmad.cpp
@@ -12,6 +12,7 @@ namespace VideoCommon::Shader {
using Tegra::Shader::Instruction;
using Tegra::Shader::OpCode;
+using Tegra::Shader::PredCondition;
u32 ShaderIR::DecodeXmad(NodeBlock& bb, u32 pc) {
const Instruction instr = {program_code[pc]};
@@ -63,15 +64,18 @@ u32 ShaderIR::DecodeXmad(NodeBlock& bb, u32 pc) {
}
}();
- op_a = BitfieldExtract(op_a, instr.xmad.high_a ? 16 : 0, 16);
+ op_a = SignedOperation(OperationCode::IBitfieldExtract, is_signed_a, std::move(op_a),
+ instr.xmad.high_a ? Immediate(16) : Immediate(0), Immediate(16));
const Node original_b = op_b;
- op_b = BitfieldExtract(op_b, is_high_b ? 16 : 0, 16);
+ op_b = SignedOperation(OperationCode::IBitfieldExtract, is_signed_b, std::move(op_b),
+ is_high_b ? Immediate(16) : Immediate(0), Immediate(16));
- // TODO(Rodrigo): Use an appropiate sign for this operation
- Node product = Operation(OperationCode::IMul, NO_PRECISE, op_a, op_b);
+ // we already check sign_a and sign_b is difference or not before so just use one in here.
+ Node product = SignedOperation(OperationCode::IMul, is_signed_a, op_a, op_b);
if (is_psl) {
- product = Operation(OperationCode::ILogicalShiftLeft, NO_PRECISE, product, Immediate(16));
+ product =
+ SignedOperation(OperationCode::ILogicalShiftLeft, is_signed_a, product, Immediate(16));
}
SetTemporary(bb, 0, product);
product = GetTemporary(0);
@@ -88,12 +92,40 @@ u32 ShaderIR::DecodeXmad(NodeBlock& bb, u32 pc) {
return BitfieldExtract(original_c, 16, 16);
case Tegra::Shader::XmadMode::CBcc: {
const Node shifted_b = SignedOperation(OperationCode::ILogicalShiftLeft, is_signed_b,
- NO_PRECISE, original_b, Immediate(16));
- return SignedOperation(OperationCode::IAdd, is_signed_c, NO_PRECISE, original_c,
- shifted_b);
+ original_b, Immediate(16));
+ return SignedOperation(OperationCode::IAdd, is_signed_c, original_c, shifted_b);
+ }
+ case Tegra::Shader::XmadMode::CSfu: {
+ const Node comp_a = GetPredicateComparisonInteger(PredCondition::Equal, is_signed_a,
+ op_a, Immediate(0));
+ const Node comp_b = GetPredicateComparisonInteger(PredCondition::Equal, is_signed_b,
+ op_b, Immediate(0));
+ const Node comp =
+ Operation(OperationCode::LogicalOr, std::move(comp_a), std::move(comp_b));
+
+ const Node comp_minus_a = GetPredicateComparisonInteger(
+ PredCondition::NotEqual, is_signed_a,
+ SignedOperation(OperationCode::IBitwiseAnd, is_signed_a, op_a,
+ Immediate(0x80000000)),
+ Immediate(0));
+ const Node comp_minus_b = GetPredicateComparisonInteger(
+ PredCondition::NotEqual, is_signed_b,
+ SignedOperation(OperationCode::IBitwiseAnd, is_signed_b, op_b,
+ Immediate(0x80000000)),
+ Immediate(0));
+
+ Node new_c = Operation(
+ OperationCode::Select, comp_minus_a,
+ SignedOperation(OperationCode::IAdd, is_signed_c, original_c, Immediate(-65536)),
+ original_c);
+ new_c = Operation(
+ OperationCode::Select, comp_minus_b,
+ SignedOperation(OperationCode::IAdd, is_signed_c, new_c, Immediate(-65536)), new_c);
+
+ return Operation(OperationCode::Select, comp, original_c, new_c);
}
default:
- UNIMPLEMENTED_MSG("Unhandled XMAD mode: {}", static_cast<u32>(instr.xmad.mode.Value()));
+ UNREACHABLE();
return Immediate(0);
}
}();