summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/video_core/engines/shader_bytecode.h4
-rw-r--r--src/video_core/shader/decode/other.cpp6
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:
1844 MOV_C, 1844 MOV_C,
1845 MOV_R, 1845 MOV_R,
1846 MOV_IMM, 1846 MOV_IMM,
1847 MOV_SYS, 1847 S2R,
1848 MOV32_IMM, 1848 MOV32_IMM,
1849 SHL_C, 1849 SHL_C,
1850 SHL_R, 1850 SHL_R,
@@ -2138,7 +2138,7 @@ private:
2138 INST("0100110010011---", Id::MOV_C, Type::Arithmetic, "MOV_C"), 2138 INST("0100110010011---", Id::MOV_C, Type::Arithmetic, "MOV_C"),
2139 INST("0101110010011---", Id::MOV_R, Type::Arithmetic, "MOV_R"), 2139 INST("0101110010011---", Id::MOV_R, Type::Arithmetic, "MOV_R"),
2140 INST("0011100-10011---", Id::MOV_IMM, Type::Arithmetic, "MOV_IMM"), 2140 INST("0011100-10011---", Id::MOV_IMM, Type::Arithmetic, "MOV_IMM"),
2141 INST("1111000011001---", Id::MOV_SYS, Type::Trivial, "MOV_SYS"), 2141 INST("1111000011001---", Id::S2R, Type::Trivial, "S2R"),
2142 INST("000000010000----", Id::MOV32_IMM, Type::ArithmeticImmediate, "MOV32_IMM"), 2142 INST("000000010000----", Id::MOV32_IMM, Type::ArithmeticImmediate, "MOV32_IMM"),
2143 INST("0100110001100---", Id::FMNMX_C, Type::Arithmetic, "FMNMX_C"), 2143 INST("0100110001100---", Id::FMNMX_C, Type::Arithmetic, "FMNMX_C"),
2144 INST("0101110001100---", Id::FMNMX_R, Type::Arithmetic, "FMNMX_R"), 2144 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) {
66 bb.push_back(Operation(OperationCode::Discard)); 66 bb.push_back(Operation(OperationCode::Discard));
67 break; 67 break;
68 } 68 }
69 case OpCode::Id::MOV_SYS: { 69 case OpCode::Id::S2R: {
70 const Node value = [this, instr] { 70 const Node value = [this, instr] {
71 switch (instr.sys20) { 71 switch (instr.sys20) {
72 case SystemVariable::LaneId: 72 case SystemVariable::LaneId:
73 LOG_WARNING(HW_GPU, "MOV_SYS instruction with LaneId is incomplete"); 73 LOG_WARNING(HW_GPU, "S2R instruction with LaneId is incomplete");
74 return Immediate(0U); 74 return Immediate(0U);
75 case SystemVariable::InvocationId: 75 case SystemVariable::InvocationId:
76 return Operation(OperationCode::InvocationId); 76 return Operation(OperationCode::InvocationId);
77 case SystemVariable::Ydirection: 77 case SystemVariable::Ydirection:
78 return Operation(OperationCode::YNegate); 78 return Operation(OperationCode::YNegate);
79 case SystemVariable::InvocationInfo: 79 case SystemVariable::InvocationInfo:
80 LOG_WARNING(HW_GPU, "MOV_SYS instruction with InvocationInfo is incomplete"); 80 LOG_WARNING(HW_GPU, "S2R instruction with InvocationInfo is incomplete");
81 return Immediate(0U); 81 return Immediate(0U);
82 case SystemVariable::Tid: { 82 case SystemVariable::Tid: {
83 Node value = Immediate(0); 83 Node value = Immediate(0);