diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 1 | ||||
| -rw-r--r-- | src/video_core/shader/decode/float_set_predicate.cpp | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index aaa1acea9..103f39e91 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -873,6 +873,7 @@ union Instruction { | |||
| 873 | union { | 873 | union { |
| 874 | BitField<0, 3, u64> pred0; | 874 | BitField<0, 3, u64> pred0; |
| 875 | BitField<3, 3, u64> pred3; | 875 | BitField<3, 3, u64> pred3; |
| 876 | BitField<6, 1, u64> neg_b; | ||
| 876 | BitField<7, 1, u64> abs_a; | 877 | BitField<7, 1, u64> abs_a; |
| 877 | BitField<39, 3, u64> pred39; | 878 | BitField<39, 3, u64> pred39; |
| 878 | BitField<42, 1, u64> neg_pred; | 879 | BitField<42, 1, u64> neg_pred; |
diff --git a/src/video_core/shader/decode/float_set_predicate.cpp b/src/video_core/shader/decode/float_set_predicate.cpp index 2323052b0..815464f28 100644 --- a/src/video_core/shader/decode/float_set_predicate.cpp +++ b/src/video_core/shader/decode/float_set_predicate.cpp | |||
| @@ -18,8 +18,8 @@ u32 ShaderIR::DecodeFloatSetPredicate(NodeBlock& bb, u32 pc) { | |||
| 18 | const Instruction instr = {program_code[pc]}; | 18 | const Instruction instr = {program_code[pc]}; |
| 19 | const auto opcode = OpCode::Decode(instr); | 19 | const auto opcode = OpCode::Decode(instr); |
| 20 | 20 | ||
| 21 | const Node op_a = GetOperandAbsNegFloat(GetRegister(instr.gpr8), instr.fsetp.abs_a != 0, | 21 | Node op_a = GetOperandAbsNegFloat(GetRegister(instr.gpr8), instr.fsetp.abs_a != 0, |
| 22 | instr.fsetp.neg_a != 0); | 22 | instr.fsetp.neg_a != 0); |
| 23 | Node op_b = [&]() { | 23 | Node op_b = [&]() { |
| 24 | if (instr.is_b_imm) { | 24 | if (instr.is_b_imm) { |
| 25 | return GetImmediate19(instr); | 25 | return GetImmediate19(instr); |
| @@ -29,12 +29,13 @@ u32 ShaderIR::DecodeFloatSetPredicate(NodeBlock& bb, u32 pc) { | |||
| 29 | return GetConstBuffer(instr.cbuf34.index, instr.cbuf34.GetOffset()); | 29 | return GetConstBuffer(instr.cbuf34.index, instr.cbuf34.GetOffset()); |
| 30 | } | 30 | } |
| 31 | }(); | 31 | }(); |
| 32 | op_b = GetOperandAbsNegFloat(op_b, instr.fsetp.abs_b, false); | 32 | op_b = GetOperandAbsNegFloat(std::move(op_b), instr.fsetp.abs_b, instr.fsetp.neg_b); |
| 33 | 33 | ||
| 34 | // We can't use the constant predicate as destination. | 34 | // We can't use the constant predicate as destination. |
| 35 | ASSERT(instr.fsetp.pred3 != static_cast<u64>(Pred::UnusedIndex)); | 35 | ASSERT(instr.fsetp.pred3 != static_cast<u64>(Pred::UnusedIndex)); |
| 36 | 36 | ||
| 37 | const Node predicate = GetPredicateComparisonFloat(instr.fsetp.cond, op_a, op_b); | 37 | const Node predicate = |
| 38 | GetPredicateComparisonFloat(instr.fsetp.cond, std::move(op_a), std::move(op_b)); | ||
| 38 | const Node second_pred = GetPredicate(instr.fsetp.pred39, instr.fsetp.neg_pred != 0); | 39 | const Node second_pred = GetPredicate(instr.fsetp.pred39, instr.fsetp.neg_pred != 0); |
| 39 | 40 | ||
| 40 | const OperationCode combiner = GetPredicateCombiner(instr.fsetp.op); | 41 | const OperationCode combiner = GetPredicateCombiner(instr.fsetp.op); |