diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-03 03:44:38 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-02-03 04:25:40 +0100 |
| commit | 9feb68085d05a265fd9ec7f26791390516cd3bd6 (patch) | |
| tree | fff3e69a9b3408596e44dd1abdc2e6a398d6e613 | |
| parent | shader_ir/memory: Add LD_L 64 bits loads (diff) | |
| download | yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar.gz yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar.bz2 yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar.lz yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar.xz yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.tar.zst yuzu-9feb68085d05a265fd9ec7f26791390516cd3bd6.zip | |
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 6 | ||||
| -rw-r--r-- | src/video_core/shader/decode/memory.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index 713b01c9f..2f5a966d2 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -217,9 +217,9 @@ enum class StoreType : u64 { Signed8 = 1, Unsigned16 = 2, Signed16 = 3, - Bytes32 = 4, - Bytes64 = 5, - Bytes128 = 6, + Bits32 = 4, + Bits64 = 5, + Bits128 = 6, }; enum class IMinMaxExchange : u64 { diff --git a/src/video_core/shader/decode/memory.cpp b/src/video_core/shader/decode/memory.cpp index 63965525c..2321a37a2 100644 --- a/src/video_core/shader/decode/memory.cpp +++ b/src/video_core/shader/decode/memory.cpp @@ -115,10 +115,10 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, const BasicBlock& code, u32 pc) { }; switch (instr.ldst_sl.type.Value()) { - case Tegra::Shader::StoreType::Bytes32: + case Tegra::Shader::StoreType::Bits32: SetRegister(bb, instr.gpr0, GetLmem(0)); break; - case Tegra::Shader::StoreType::Bytes64: { + case Tegra::Shader::StoreType::Bits64: { SetTemporal(bb, 0, GetLmem(0)); SetTemporal(bb, 1, GetLmem(4)); SetRegister(bb, instr.gpr0, GetTemporal(0)); @@ -127,7 +127,7 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, const BasicBlock& code, u32 pc) { } default: UNIMPLEMENTED_MSG("LD_L Unhandled type: {}", - static_cast<unsigned>(instr.ldst_sl.type.Value())); + static_cast<u32>(instr.ldst_sl.type.Value())); } break; } @@ -217,7 +217,7 @@ u32 ShaderIR::DecodeMemory(BasicBlock& bb, const BasicBlock& code, u32 pc) { Immediate(static_cast<s32>(instr.smem_imm))); switch (instr.ldst_sl.type.Value()) { - case Tegra::Shader::StoreType::Bytes32: + case Tegra::Shader::StoreType::Bits32: SetLocalMemory(bb, index, GetRegister(instr.gpr0)); break; default: |