diff options
| author | bunnei <bunneidev@gmail.com> | 2020-05-30 17:51:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 17:51:42 +0200 |
| commit | 058ec22787a6d3e41c3dfabd2060a1b723594374 (patch) | |
| tree | 0c9498d5e104ce52c2e50f1a0020a97516924d06 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #4017 from ogniK5377/xbyak (diff) | |
| parent | shader/other: Implement MEMBAR.CTS (diff) | |
| download | yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar.gz yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar.bz2 yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar.lz yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar.xz yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.tar.zst yuzu-058ec22787a6d3e41c3dfabd2060a1b723594374.zip | |
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp index 890f34a2c..6f6dedd82 100644 --- a/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp +++ b/src/video_core/renderer_vulkan/vk_shader_decompiler.cpp @@ -2215,8 +2215,8 @@ private: return {}; } - Expression MemoryBarrierGL(Operation) { - const auto scope = spv::Scope::Device; + template <spv::Scope scope> + Expression MemoryBarrier(Operation) { const auto semantics = spv::MemorySemanticsMask::AcquireRelease | spv::MemorySemanticsMask::UniformMemory | spv::MemorySemanticsMask::WorkgroupMemory | @@ -2681,7 +2681,8 @@ private: &SPIRVDecompiler::ShuffleIndexed, &SPIRVDecompiler::Barrier, - &SPIRVDecompiler::MemoryBarrierGL, + &SPIRVDecompiler::MemoryBarrier<spv::Scope::Workgroup>, + &SPIRVDecompiler::MemoryBarrier<spv::Scope::Device>, }; static_assert(operation_decompilers.size() == static_cast<std::size_t>(OperationCode::Amount)); |