SPV: Memory model: Reduce set of memory-semantic bits requested for "all".

diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 0cb166aff9f349d267d7ed5ebcbdb128b6f80e8f..faa2701fff7f1a56f18509652dad558704730dc6 100755 (executable)
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -75,9 +75,7 @@ const Decoration NoPrecision = DecorationMax;
 POTENTIALLY_UNUSED
 const MemorySemanticsMask MemorySemanticsAllMemory =
                 (MemorySemanticsMask)(MemorySemanticsUniformMemoryMask |
-                                      MemorySemanticsSubgroupMemoryMask |
                                       MemorySemanticsWorkgroupMemoryMask |
-                                      MemorySemanticsCrossWorkgroupMemoryMask |
                                       MemorySemanticsAtomicCounterMemoryMask |
                                       MemorySemanticsImageMemoryMask);
 

diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out
index f5b4814b023b438b843474dec4f03cd94ad2a8ed..0a9cb14032b149af8e3871f4f82a6e8c83687a7a 100644 (file)
--- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out
+++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out
@@ -71,7 +71,7 @@ local_size = (1, 1, 1)
                7:             TypeFunction 6(float)
               10:             TypeInt 32 0
               11:     10(int) Constant 1
-              12:     10(int) Constant 4040
+              12:     10(int) Constant 3400
               13:     10(int) Constant 2
               14:     10(int) Constant 2120
               15:     10(int) Constant 264

diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out
index 4fdd887fb7df3b4f042309bf9d002544afc1c411..5ca40f8d60613fabeb5485155be14f6f3c6b225e 100644 (file)
--- a/Test/baseResults/spv.310.comp.out
+++ b/Test/baseResults/spv.310.comp.out
@@ -93,7 +93,7 @@ spv.310.comp
               63:             TypePointer Input 15(int)
 64(gl_DeviceIndex):     63(ptr) Variable Input
               65:      6(int) Constant 1
-              66:      6(int) Constant 4040
+              66:      6(int) Constant 3400
               67:      6(int) Constant 16
               68:      6(int) Constant 32
               69:      6(int) Constant 4

diff --git a/Test/baseResults/spv.barrier.vert.out b/Test/baseResults/spv.barrier.vert.out
index cb588d691db5cdcc80883e3179870c1160fa57a4..5157f8876d9a5416c86013a94c3995a5c49d7cae 100755 (executable)
--- a/Test/baseResults/spv.barrier.vert.out
+++ b/Test/baseResults/spv.barrier.vert.out
@@ -23,7 +23,7 @@ spv.barrier.vert
               11:    7(fvec4) ConstantComposite 10 10 10 10
               12:             TypeInt 32 0
               13:     12(int) Constant 1
-              14:     12(int) Constant 4040
+              14:     12(int) Constant 3400
           15(c1):      8(ptr) Variable Output
               16:     12(int) Constant 72
               20:     12(int) Constant 2056