summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2020-05-26 12:50:41 -0400
committerGravatar GitHub2020-05-26 12:50:41 -0400
commit623d9c47a2d1a5b32ad67d3e1d86baf9d10851ef (patch)
treeb18ce78e109861765433734498a42b69e66f6fcb /src
parentMerge pull request #3978 from ReinUsesLisp/write-rz (diff)
parentshader/memory: Implement non-addition operations in RED (diff)
downloadyuzu-623d9c47a2d1a5b32ad67d3e1d86baf9d10851ef.tar.gz
yuzu-623d9c47a2d1a5b32ad67d3e1d86baf9d10851ef.tar.xz
yuzu-623d9c47a2d1a5b32ad67d3e1d86baf9d10851ef.zip
Merge pull request #3980 from ReinUsesLisp/red-op
shader/memory: Implement non-addition operations in RED
Diffstat (limited to 'src')
-rw-r--r--src/video_core/shader/decode/memory.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/shader/decode/memory.cpp b/src/video_core/shader/decode/memory.cpp
index 9392f065b..63adbc4a3 100644
--- a/src/video_core/shader/decode/memory.cpp
+++ b/src/video_core/shader/decode/memory.cpp
@@ -387,7 +387,6 @@ u32 ShaderIR::DecodeMemory(NodeBlock& bb, u32 pc) {
387 } 387 }
388 case OpCode::Id::RED: { 388 case OpCode::Id::RED: {
389 UNIMPLEMENTED_IF_MSG(instr.red.type != GlobalAtomicType::U32); 389 UNIMPLEMENTED_IF_MSG(instr.red.type != GlobalAtomicType::U32);
390 UNIMPLEMENTED_IF_MSG(instr.red.operation != AtomicOp::Add);
391 const auto [real_address, base_address, descriptor] = 390 const auto [real_address, base_address, descriptor] =
392 TrackGlobalMemory(bb, instr, true, true); 391 TrackGlobalMemory(bb, instr, true, true);
393 if (!real_address || !base_address) { 392 if (!real_address || !base_address) {
@@ -396,7 +395,7 @@ u32 ShaderIR::DecodeMemory(NodeBlock& bb, u32 pc) {
396 } 395 }
397 Node gmem = MakeNode<GmemNode>(real_address, base_address, descriptor); 396 Node gmem = MakeNode<GmemNode>(real_address, base_address, descriptor);
398 Node value = GetRegister(instr.gpr0); 397 Node value = GetRegister(instr.gpr0);
399 bb.push_back(Operation(OperationCode::ReduceIAdd, move(gmem), move(value))); 398 bb.push_back(Operation(GetAtomOperation(instr.red.operation), move(gmem), move(value)));
400 break; 399 break;
401 } 400 }
402 case OpCode::Id::ATOM: { 401 case OpCode::Id::ATOM: {