Remove obsolete use of AtomicCounterMemoryMask.
This commit is contained in:
parent
67b2991451
commit
00d5c78447
@ -9931,7 +9931,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
|
||||
else
|
||||
{
|
||||
const uint32_t all_barriers = MemorySemanticsWorkgroupMemoryMask | MemorySemanticsUniformMemoryMask |
|
||||
MemorySemanticsImageMemoryMask | MemorySemanticsAtomicCounterMemoryMask;
|
||||
MemorySemanticsImageMemoryMask;
|
||||
|
||||
if (semantics & (MemorySemanticsCrossWorkgroupMemoryMask | MemorySemanticsSubgroupMemoryMask))
|
||||
{
|
||||
@ -9953,8 +9953,6 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
|
||||
statement("memoryBarrierBuffer();");
|
||||
if (semantics & MemorySemanticsImageMemoryMask)
|
||||
statement("memoryBarrierImage();");
|
||||
if (semantics & MemorySemanticsAtomicCounterMemoryMask)
|
||||
statement("memoryBarrierAtomicCounter();");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6513,8 +6513,7 @@ void CompilerMSL::emit_barrier(uint32_t id_exe_scope, uint32_t id_mem_scope, uin
|
||||
|
||||
// Fix tessellation patch function processing
|
||||
if (get_execution_model() == ExecutionModelTessellationControl ||
|
||||
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
|
||||
MemorySemanticsAtomicCounterMemoryMask)))
|
||||
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask)))
|
||||
{
|
||||
if (!mem_flags.empty())
|
||||
mem_flags += " | ";
|
||||
@ -6535,13 +6534,11 @@ void CompilerMSL::emit_barrier(uint32_t id_exe_scope, uint32_t id_mem_scope, uin
|
||||
else
|
||||
{
|
||||
if ((mem_sem & (MemorySemanticsUniformMemoryMask | MemorySemanticsCrossWorkgroupMemoryMask)) &&
|
||||
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
|
||||
MemorySemanticsAtomicCounterMemoryMask)))
|
||||
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask)))
|
||||
bar_stmt += "mem_flags::mem_device_and_threadgroup";
|
||||
else if (mem_sem & (MemorySemanticsUniformMemoryMask | MemorySemanticsCrossWorkgroupMemoryMask))
|
||||
bar_stmt += "mem_flags::mem_device";
|
||||
else if (mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
|
||||
MemorySemanticsAtomicCounterMemoryMask))
|
||||
else if (mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask))
|
||||
bar_stmt += "mem_flags::mem_threadgroup";
|
||||
else if (mem_sem & MemorySemanticsImageMemoryMask)
|
||||
bar_stmt += "mem_flags::mem_texture";
|
||||
|
Loading…
Reference in New Issue
Block a user