diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-05-15 07:52:35 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-05-27 05:19:45 +0200 |
commit | 32e6727daecab60d368d14619c1e04d0d7e60008 (patch) | |
tree | 427eade0b7069869011365137de2c87bc15df7e0 /src/video_core/renderer_vulkan/vk_shader_decompiler.cpp | |
parent | Merge pull request #3981 from ReinUsesLisp/bar (diff) | |
download | yuzu-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 '')
-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)); |