diff options
author | bunnei <bunneidev@gmail.com> | 2019-02-01 19:24:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-01 19:24:04 +0100 |
commit | eceab45dac2b67392a896fa322af15e6aa81c242 (patch) | |
tree | efe4c76ad073669099073c556201fb7c456807f2 /src/video_core/shader/decode/xmad.cpp | |
parent | Merge pull request #2073 from lioncash/opus (diff) | |
parent | shader_ir: Unify constant buffer offset values (diff) | |
download | yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar.gz yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar.bz2 yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar.lz yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar.xz yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.tar.zst yuzu-eceab45dac2b67392a896fa322af15e6aa81c242.zip |
Diffstat (limited to 'src/video_core/shader/decode/xmad.cpp')
-rw-r--r-- | src/video_core/shader/decode/xmad.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/shader/decode/xmad.cpp b/src/video_core/shader/decode/xmad.cpp index 0cd9cd1cc..9cb864500 100644 --- a/src/video_core/shader/decode/xmad.cpp +++ b/src/video_core/shader/decode/xmad.cpp @@ -32,13 +32,14 @@ u32 ShaderIR::DecodeXmad(BasicBlock& bb, const BasicBlock& code, u32 pc) { auto [is_merge, op_b, op_c] = [&]() -> std::tuple<bool, Node, Node> { switch (opcode->get().GetId()) { case OpCode::Id::XMAD_CR: - return {instr.xmad.merge_56, GetConstBuffer(instr.cbuf34.index, instr.cbuf34.offset), + return {instr.xmad.merge_56, + GetConstBuffer(instr.cbuf34.index, instr.cbuf34.GetOffset()), GetRegister(instr.gpr39)}; case OpCode::Id::XMAD_RR: return {instr.xmad.merge_37, GetRegister(instr.gpr20), GetRegister(instr.gpr39)}; case OpCode::Id::XMAD_RC: return {false, GetRegister(instr.gpr39), - GetConstBuffer(instr.cbuf34.index, instr.cbuf34.offset)}; + GetConstBuffer(instr.cbuf34.index, instr.cbuf34.GetOffset())}; case OpCode::Id::XMAD_IMM: return {instr.xmad.merge_37, Immediate(static_cast<u32>(instr.xmad.imm20_16)), GetRegister(instr.gpr39)}; |