From 2505057af8f446981afc63768a97a3b4a8ccdd99 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Fri, 15 Dec 2017 08:51:31 -0700
Subject: [PATCH] SPV: Memory model: Reduce set of memory-semantic bits
 requested for "all".

---
 SPIRV/spvIR.h                                      | 2 --
 Test/baseResults/hlsl.intrinsics.barriers.comp.out | 2 +-
 Test/baseResults/spv.310.comp.out                  | 2 +-
 Test/baseResults/spv.barrier.vert.out              | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 0cb166af..faa2701f 100755
--- 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 f5b4814b..0a9cb140 100644
--- 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 4fdd887f..5ca40f8d 100644
--- 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 cb588d69..5157f887 100755
--- 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