diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 2 | ||||
| -rw-r--r-- | src/video_core/shader/decode/bfi.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index cbb201114..81b6d9eff 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h | |||
| @@ -1708,6 +1708,7 @@ public: | |||
| 1708 | BFE_C, | 1708 | BFE_C, |
| 1709 | BFE_R, | 1709 | BFE_R, |
| 1710 | BFE_IMM, | 1710 | BFE_IMM, |
| 1711 | BFI_RC, | ||
| 1711 | BFI_IMM_R, | 1712 | BFI_IMM_R, |
| 1712 | BRA, | 1713 | BRA, |
| 1713 | BRX, | 1714 | BRX, |
| @@ -2135,6 +2136,7 @@ private: | |||
| 2135 | INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"), | 2136 | INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"), |
| 2136 | INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"), | 2137 | INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"), |
| 2137 | INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"), | 2138 | INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"), |
| 2139 | INST("0101001111110---", Id::BFI_RC, Type::Bfi, "BFI_RC"), | ||
| 2138 | INST("0011011-11110---", Id::BFI_IMM_R, Type::Bfi, "BFI_IMM_R"), | 2140 | INST("0011011-11110---", Id::BFI_IMM_R, Type::Bfi, "BFI_IMM_R"), |
| 2139 | INST("0100110001000---", Id::LOP_C, Type::ArithmeticInteger, "LOP_C"), | 2141 | INST("0100110001000---", Id::LOP_C, Type::ArithmeticInteger, "LOP_C"), |
| 2140 | INST("0101110001000---", Id::LOP_R, Type::ArithmeticInteger, "LOP_R"), | 2142 | INST("0101110001000---", Id::LOP_R, Type::ArithmeticInteger, "LOP_R"), |
diff --git a/src/video_core/shader/decode/bfi.cpp b/src/video_core/shader/decode/bfi.cpp index 8be1119df..f992bbe2a 100644 --- a/src/video_core/shader/decode/bfi.cpp +++ b/src/video_core/shader/decode/bfi.cpp | |||
| @@ -17,10 +17,13 @@ u32 ShaderIR::DecodeBfi(NodeBlock& bb, u32 pc) { | |||
| 17 | const Instruction instr = {program_code[pc]}; | 17 | const Instruction instr = {program_code[pc]}; |
| 18 | const auto opcode = OpCode::Decode(instr); | 18 | const auto opcode = OpCode::Decode(instr); |
| 19 | 19 | ||
| 20 | const auto [base, packed_shift] = [&]() -> std::tuple<Node, Node> { | 20 | const auto [packed_shift, base] = [&]() -> std::pair<Node, Node> { |
| 21 | switch (opcode->get().GetId()) { | 21 | switch (opcode->get().GetId()) { |
| 22 | case OpCode::Id::BFI_RC: | ||
| 23 | return {GetRegister(instr.gpr39), | ||
| 24 | GetConstBuffer(instr.cbuf34.index, instr.cbuf34.offset)}; | ||
| 22 | case OpCode::Id::BFI_IMM_R: | 25 | case OpCode::Id::BFI_IMM_R: |
| 23 | return {GetRegister(instr.gpr39), Immediate(instr.alu.GetSignedImm20_20())}; | 26 | return {Immediate(instr.alu.GetSignedImm20_20()), GetRegister(instr.gpr39)}; |
| 24 | default: | 27 | default: |
| 25 | UNREACHABLE(); | 28 | UNREACHABLE(); |
| 26 | return {Immediate(0), Immediate(0)}; | 29 | return {Immediate(0), Immediate(0)}; |