diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-04-04 08:37:51 +0200 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-04-04 08:37:51 +0200 |
| commit | 8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67 (patch) | |
| tree | c24ecb09424253d2dd2cd71865ddb3da6d5e6ad5 /src | |
| parent | shader_bytecode: Add encoding for BAR (diff) | |
| download | yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar.gz yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar.bz2 yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar.lz yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar.xz yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.tar.zst yuzu-8b719e9e1d55786c1e5ed7c14aa469f59a4f5b67.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/engines/shader_bytecode.h | 4 | ||||
| -rw-r--r-- | src/video_core/shader/decode/other.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/engines/shader_bytecode.h b/src/video_core/engines/shader_bytecode.h index c141b27b7..498936f0c 100644 --- a/src/video_core/engines/shader_bytecode.h +++ b/src/video_core/engines/shader_bytecode.h @@ -1844,7 +1844,7 @@ public: MOV_C, MOV_R, MOV_IMM, - MOV_SYS, + S2R, MOV32_IMM, SHL_C, SHL_R, @@ -2138,7 +2138,7 @@ private: INST("0100110010011---", Id::MOV_C, Type::Arithmetic, "MOV_C"), INST("0101110010011---", Id::MOV_R, Type::Arithmetic, "MOV_R"), INST("0011100-10011---", Id::MOV_IMM, Type::Arithmetic, "MOV_IMM"), - INST("1111000011001---", Id::MOV_SYS, Type::Trivial, "MOV_SYS"), + INST("1111000011001---", Id::S2R, Type::Trivial, "S2R"), INST("000000010000----", Id::MOV32_IMM, Type::ArithmeticImmediate, "MOV32_IMM"), INST("0100110001100---", Id::FMNMX_C, Type::Arithmetic, "FMNMX_C"), INST("0101110001100---", Id::FMNMX_R, Type::Arithmetic, "FMNMX_R"), diff --git a/src/video_core/shader/decode/other.cpp b/src/video_core/shader/decode/other.cpp index 4944e9d69..94e39c125 100644 --- a/src/video_core/shader/decode/other.cpp +++ b/src/video_core/shader/decode/other.cpp @@ -66,18 +66,18 @@ u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) { bb.push_back(Operation(OperationCode::Discard)); break; } - case OpCode::Id::MOV_SYS: { + case OpCode::Id::S2R: { const Node value = [this, instr] { switch (instr.sys20) { case SystemVariable::LaneId: - LOG_WARNING(HW_GPU, "MOV_SYS instruction with LaneId is incomplete"); + LOG_WARNING(HW_GPU, "S2R instruction with LaneId is incomplete"); return Immediate(0U); case SystemVariable::InvocationId: return Operation(OperationCode::InvocationId); case SystemVariable::Ydirection: return Operation(OperationCode::YNegate); case SystemVariable::InvocationInfo: - LOG_WARNING(HW_GPU, "MOV_SYS instruction with InvocationInfo is incomplete"); + LOG_WARNING(HW_GPU, "S2R instruction with InvocationInfo is incomplete"); return Immediate(0U); case SystemVariable::Tid: { Node value = Immediate(0); |