CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3544 from makigumo/myfork/patch-2 

xmad: fix clang build error
master
bunnei 2020-03-25 19:29:16 +07:00 committed by GitHub
parent e6aff11057 5a5c6d4ed8
commit 23c7dda710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video_core/shader/decode/xmad.cpp
Unescape Escape View File

@ -31,7 +31,7 @@ u32 ShaderIR::DecodeXmad(NodeBlock& bb, u32 pc) {
const bool is_signed_b = instr.xmad.sign_b == 1; const bool is_signed_b = instr.xmad.sign_b == 1;
const bool is_signed_c = is_signed_a; const bool is_signed_c = is_signed_a;
auto [is_merge, is_psl, is_high_b, mode, op_b, auto [is_merge, is_psl, is_high_b, mode, op_b_binding,
op_c] = [&]() -> std::tuple<bool, bool, bool, Tegra::Shader::XmadMode, Node, Node> { op_c] = [&]() -> std::tuple<bool, bool, bool, Tegra::Shader::XmadMode, Node, Node> {
switch (opcode->get().GetId()) { switch (opcode->get().GetId()) {
case OpCode::Id::XMAD_CR: case OpCode::Id::XMAD_CR:
@ -67,9 +67,10 @@ u32 ShaderIR::DecodeXmad(NodeBlock& bb, u32 pc) {
op_a = SignedOperation(OperationCode::IBitfieldExtract, is_signed_a, std::move(op_a), op_a = SignedOperation(OperationCode::IBitfieldExtract, is_signed_a, std::move(op_a),
instr.xmad.high_a ? Immediate(16) : Immediate(0), Immediate(16)); instr.xmad.high_a ? Immediate(16) : Immediate(0), Immediate(16));
const Node original_b = op_b; const Node original_b = op_b_binding;
op_b = SignedOperation(OperationCode::IBitfieldExtract, is_signed_b, std::move(op_b), const Node op_b =
is_high_b ? Immediate(16) : Immediate(0), Immediate(16)); SignedOperation(OperationCode::IBitfieldExtract, is_signed_b, std::move(op_b_binding),
is_high_b ? Immediate(16) : Immediate(0), Immediate(16));
// we already check sign_a and sign_b is difference or not before so just use one in here. // 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); Node product = SignedOperation(OperationCode::IMul, is_signed_a, op_a, op_b);