diff options
| author | 2021-04-18 20:47:31 -0400 | |
|---|---|---|
| committer | 2021-07-22 21:51:28 -0400 | |
| commit | 5b8afed87115c82cb48913fd47dfbfa347e4faa5 (patch) | |
| tree | 84eff714b71e1f3e5f1b9436e877327480144b0b /src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp | |
| parent | shader: Address feedback (diff) | |
| download | yuzu-5b8afed87115c82cb48913fd47dfbfa347e4faa5.tar.gz yuzu-5b8afed87115c82cb48913fd47dfbfa347e4faa5.tar.xz yuzu-5b8afed87115c82cb48913fd47dfbfa347e4faa5.zip | |
spirv: Replace Constant/ConstantComposite with Const helper
Diffstat (limited to 'src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp')
| -rw-r--r-- | src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp index 366dc6a0c..705aebd81 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_barriers.cpp | |||
| @@ -12,8 +12,7 @@ void MemoryBarrier(EmitContext& ctx, spv::Scope scope) { | |||
| 12 | spv::MemorySemanticsMask::AcquireRelease | spv::MemorySemanticsMask::UniformMemory | | 12 | spv::MemorySemanticsMask::AcquireRelease | spv::MemorySemanticsMask::UniformMemory | |
| 13 | spv::MemorySemanticsMask::WorkgroupMemory | spv::MemorySemanticsMask::AtomicCounterMemory | | 13 | spv::MemorySemanticsMask::WorkgroupMemory | spv::MemorySemanticsMask::AtomicCounterMemory | |
| 14 | spv::MemorySemanticsMask::ImageMemory}; | 14 | spv::MemorySemanticsMask::ImageMemory}; |
| 15 | ctx.OpMemoryBarrier(ctx.Constant(ctx.U32[1], static_cast<u32>(scope)), | 15 | ctx.OpMemoryBarrier(ctx.Const(static_cast<u32>(scope)), ctx.Const(static_cast<u32>(semantics))); |
| 16 | ctx.Constant(ctx.U32[1], static_cast<u32>(semantics))); | ||
| 17 | } | 16 | } |
| 18 | } // Anonymous namespace | 17 | } // Anonymous namespace |
| 19 | 18 | ||
| @@ -22,9 +21,9 @@ void EmitBarrier(EmitContext& ctx) { | |||
| 22 | const auto memory{spv::Scope::Workgroup}; | 21 | const auto memory{spv::Scope::Workgroup}; |
| 23 | const auto memory_semantics{spv::MemorySemanticsMask::AcquireRelease | | 22 | const auto memory_semantics{spv::MemorySemanticsMask::AcquireRelease | |
| 24 | spv::MemorySemanticsMask::WorkgroupMemory}; | 23 | spv::MemorySemanticsMask::WorkgroupMemory}; |
| 25 | ctx.OpControlBarrier(ctx.Constant(ctx.U32[1], static_cast<u32>(execution)), | 24 | ctx.OpControlBarrier(ctx.Const(static_cast<u32>(execution)), |
| 26 | ctx.Constant(ctx.U32[1], static_cast<u32>(memory)), | 25 | ctx.Const(static_cast<u32>(memory)), |
| 27 | ctx.Constant(ctx.U32[1], static_cast<u32>(memory_semantics))); | 26 | ctx.Const(static_cast<u32>(memory_semantics))); |
| 28 | } | 27 | } |
| 29 | 28 | ||
| 30 | void EmitWorkgroupMemoryBarrier(EmitContext& ctx) { | 29 | void EmitWorkgroupMemoryBarrier(EmitContext& ctx) { |