Skip to content

Commit 00d5c78

Browse files
Remove obsolete use of AtomicCounterMemoryMask.
1 parent 67b2991 commit 00d5c78

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

spirv_glsl.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9931,7 +9931,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
99319931
else
99329932
{
99339933
const uint32_t all_barriers = MemorySemanticsWorkgroupMemoryMask | MemorySemanticsUniformMemoryMask |
9934-
MemorySemanticsImageMemoryMask | MemorySemanticsAtomicCounterMemoryMask;
9934+
MemorySemanticsImageMemoryMask;
99359935

99369936
if (semantics & (MemorySemanticsCrossWorkgroupMemoryMask | MemorySemanticsSubgroupMemoryMask))
99379937
{
@@ -9953,8 +9953,6 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
99539953
statement("memoryBarrierBuffer();");
99549954
if (semantics & MemorySemanticsImageMemoryMask)
99559955
statement("memoryBarrierImage();");
9956-
if (semantics & MemorySemanticsAtomicCounterMemoryMask)
9957-
statement("memoryBarrierAtomicCounter();");
99589956
}
99599957
}
99609958

spirv_msl.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6513,8 +6513,7 @@ void CompilerMSL::emit_barrier(uint32_t id_exe_scope, uint32_t id_mem_scope, uin
65136513

65146514
// Fix tessellation patch function processing
65156515
if (get_execution_model() == ExecutionModelTessellationControl ||
6516-
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
6517-
MemorySemanticsAtomicCounterMemoryMask)))
6516+
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask)))
65186517
{
65196518
if (!mem_flags.empty())
65206519
mem_flags += " | ";
@@ -6535,13 +6534,11 @@ void CompilerMSL::emit_barrier(uint32_t id_exe_scope, uint32_t id_mem_scope, uin
65356534
else
65366535
{
65376536
if ((mem_sem & (MemorySemanticsUniformMemoryMask | MemorySemanticsCrossWorkgroupMemoryMask)) &&
6538-
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
6539-
MemorySemanticsAtomicCounterMemoryMask)))
6537+
(mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask)))
65406538
bar_stmt += "mem_flags::mem_device_and_threadgroup";
65416539
else if (mem_sem & (MemorySemanticsUniformMemoryMask | MemorySemanticsCrossWorkgroupMemoryMask))
65426540
bar_stmt += "mem_flags::mem_device";
6543-
else if (mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask |
6544-
MemorySemanticsAtomicCounterMemoryMask))
6541+
else if (mem_sem & (MemorySemanticsSubgroupMemoryMask | MemorySemanticsWorkgroupMemoryMask))
65456542
bar_stmt += "mem_flags::mem_threadgroup";
65466543
else if (mem_sem & MemorySemanticsImageMemoryMask)
65476544
bar_stmt += "mem_flags::mem_texture";

0 commit comments

Comments
 (0)