summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/video_core/engines/shader_bytecode.h2
-rw-r--r--src/video_core/shader/decode/bfi.cpp7
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 6f98bd827..ab5c8e622 100644
--- a/src/video_core/engines/shader_bytecode.h
+++ b/src/video_core/engines/shader_bytecode.h
@@ -1675,6 +1675,7 @@ public:
1675 BFE_C, 1675 BFE_C,
1676 BFE_R, 1676 BFE_R,
1677 BFE_IMM, 1677 BFE_IMM,
1678 BFI_RC,
1678 BFI_IMM_R, 1679 BFI_IMM_R,
1679 BRA, 1680 BRA,
1680 BRX, 1681 BRX,
@@ -2098,6 +2099,7 @@ private:
2098 INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"), 2099 INST("0100110000000---", Id::BFE_C, Type::Bfe, "BFE_C"),
2099 INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"), 2100 INST("0101110000000---", Id::BFE_R, Type::Bfe, "BFE_R"),
2100 INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"), 2101 INST("0011100-00000---", Id::BFE_IMM, Type::Bfe, "BFE_IMM"),
2102 INST("0101001111110---", Id::BFI_RC, Type::Bfi, "BFI_RC"),
2101 INST("0011011-11110---", Id::BFI_IMM_R, Type::Bfi, "BFI_IMM_R"), 2103 INST("0011011-11110---", Id::BFI_IMM_R, Type::Bfi, "BFI_IMM_R"),
2102 INST("0100110001000---", Id::LOP_C, Type::ArithmeticInteger, "LOP_C"), 2104 INST("0100110001000---", Id::LOP_C, Type::ArithmeticInteger, "LOP_C"),
2103 INST("0101110001000---", Id::LOP_R, Type::ArithmeticInteger, "LOP_R"), 2105 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)};