summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader/decode
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-05-15 07:52:35 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-05-27 05:19:45 +0200
commit32e6727daecab60d368d14619c1e04d0d7e60008 (patch)
tree427eade0b7069869011365137de2c87bc15df7e0 /src/video_core/shader/decode
parentMerge pull request #3981 from ReinUsesLisp/bar (diff)
downloadyuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar.gz
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar.bz2
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar.lz
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar.xz
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.tar.zst
yuzu-32e6727daecab60d368d14619c1e04d0d7e60008.zip
Diffstat (limited to 'src/video_core/shader/decode')
-rw-r--r--src/video_core/shader/decode/other.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/video_core/shader/decode/other.cpp b/src/video_core/shader/decode/other.cpp
index 694b325e1..d00e10913 100644
--- a/src/video_core/shader/decode/other.cpp
+++ b/src/video_core/shader/decode/other.cpp
@@ -299,9 +299,19 @@ u32 ShaderIR::DecodeOther(NodeBlock& bb, u32 pc) {
break;
}
case OpCode::Id::MEMBAR: {
- UNIMPLEMENTED_IF(instr.membar.type != Tegra::Shader::MembarType::GL);
UNIMPLEMENTED_IF(instr.membar.unknown != Tegra::Shader::MembarUnknown::Default);
- bb.push_back(Operation(OperationCode::MemoryBarrierGL));
+ const OperationCode type = [instr] {
+ switch (instr.membar.type) {
+ case Tegra::Shader::MembarType::CTA:
+ return OperationCode::MemoryBarrierGroup;
+ case Tegra::Shader::MembarType::GL:
+ return OperationCode::MemoryBarrierGlobal;
+ default:
+ UNIMPLEMENTED_MSG("MEMBAR type={}", static_cast<int>(instr.membar.type.Value()));
+ return OperationCode::MemoryBarrierGlobal;
+ }
+ }();
+ bb.push_back(Operation(type));
break;
}
case OpCode::Id::DEPBAR: {