diff --git a/src/compiler/spirv/tests/avail_vis.cpp b/src/compiler/spirv/tests/avail_vis.cpp
index 6e5973039cb..ca018221ca2 100644
--- a/src/compiler/spirv/tests/avail_vis.cpp
+++ b/src/compiler/spirv/tests/avail_vis.cpp
@@ -82,7 +82,7 @@ TEST_F(AvailabilityVisibility, opload_vis)
    nir_intrinsic_instr *intrinsic = find_intrinsic(nir_intrinsic_barrier, 0);
    ASSERT_NE(intrinsic, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_VISIBLE | NIR_MEMORY_ACQUIRE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_VISIBLE);
    EXPECT_NE(nir_intrinsic_memory_modes(intrinsic) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(intrinsic), SCOPE_DEVICE);
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), SCOPE_NONE);
@@ -146,7 +146,7 @@ TEST_F(AvailabilityVisibility, opstore_avail)
    nir_intrinsic_instr *intrinsic = find_intrinsic(nir_intrinsic_barrier, 0);
    ASSERT_NE(intrinsic, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_RELEASE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_AVAILABLE);
    EXPECT_NE(nir_intrinsic_memory_modes(intrinsic) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(intrinsic), SCOPE_DEVICE);
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), SCOPE_NONE);
@@ -212,12 +212,12 @@ TEST_F(AvailabilityVisibility, opcopymemory_visavail_both_combined)
    ASSERT_NE(first, nullptr);
    ASSERT_NE(second, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(first), NIR_MEMORY_MAKE_VISIBLE | NIR_MEMORY_ACQUIRE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(first), NIR_MEMORY_MAKE_VISIBLE);
    EXPECT_NE(nir_intrinsic_memory_modes(first) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(first), SCOPE_WORKGROUP);
    EXPECT_EQ(nir_intrinsic_execution_scope(first), SCOPE_NONE);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(second), NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_RELEASE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(second), NIR_MEMORY_MAKE_AVAILABLE);
    EXPECT_NE(nir_intrinsic_memory_modes(second) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(second), SCOPE_DEVICE);
    EXPECT_EQ(nir_intrinsic_execution_scope(first), SCOPE_NONE);
@@ -284,12 +284,12 @@ TEST_F(AvailabilityVisibility, opcopymemory_visavail_both_separate)
    ASSERT_NE(first, nullptr);
    ASSERT_NE(second, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(first), NIR_MEMORY_MAKE_VISIBLE | NIR_MEMORY_ACQUIRE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(first), NIR_MEMORY_MAKE_VISIBLE);
    EXPECT_NE(nir_intrinsic_memory_modes(first) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(first), SCOPE_WORKGROUP);
    EXPECT_EQ(nir_intrinsic_execution_scope(first), SCOPE_NONE);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(second), NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_RELEASE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(second), NIR_MEMORY_MAKE_AVAILABLE);
    EXPECT_NE(nir_intrinsic_memory_modes(second) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(second), SCOPE_DEVICE);
    EXPECT_EQ(nir_intrinsic_execution_scope(second), SCOPE_NONE);
@@ -352,7 +352,7 @@ TEST_F(AvailabilityVisibility, opcopymemory_avail)
    nir_intrinsic_instr *intrinsic = find_intrinsic(nir_intrinsic_barrier, 0);
    ASSERT_NE(intrinsic, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_AVAILABLE | NIR_MEMORY_RELEASE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_AVAILABLE);
    EXPECT_NE(nir_intrinsic_memory_modes(intrinsic) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(intrinsic), SCOPE_DEVICE);
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), SCOPE_NONE);
@@ -415,7 +415,7 @@ TEST_F(AvailabilityVisibility, opcopymemory_vis)
    nir_intrinsic_instr *intrinsic = find_intrinsic(nir_intrinsic_barrier, 0);
    ASSERT_NE(intrinsic, nullptr);
 
-   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_VISIBLE | NIR_MEMORY_ACQUIRE);
+   EXPECT_EQ(nir_intrinsic_memory_semantics(intrinsic), NIR_MEMORY_MAKE_VISIBLE);
    EXPECT_NE(nir_intrinsic_memory_modes(intrinsic) & nir_var_mem_ssbo, 0);
    EXPECT_EQ(nir_intrinsic_memory_scope(intrinsic), SCOPE_WORKGROUP);
    EXPECT_EQ(nir_intrinsic_execution_scope(intrinsic), SCOPE_NONE);
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 94e1927ca07..f09dc0b8c92 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -2614,7 +2614,6 @@ vtn_emit_make_visible_barrier(struct vtn_builder *b, SpvMemoryAccessMask access,
       return;
 
    vtn_emit_memory_barrier(b, scope, SpvMemorySemanticsMakeVisibleMask |
-                                     SpvMemorySemanticsAcquireMask |
                                      vtn_mode_to_memory_semantics(mode));
 }
 
@@ -2626,7 +2625,6 @@ vtn_emit_make_available_barrier(struct vtn_builder *b, SpvMemoryAccessMask acces
       return;
 
    vtn_emit_memory_barrier(b, scope, SpvMemorySemanticsMakeAvailableMask |
-                                     SpvMemorySemanticsReleaseMask |
                                      vtn_mode_to_memory_semantics(mode));
 }