Merge branch 'jeffbolznv-memory_scope_semantics'

diff --cc SPIRV/spirv.hpp
index f16c296,622ce61..8b7977c
--- 1/SPIRV/spirv.hpp
--- 2/SPIRV/spirv.hpp
+++ b/SPIRV/spirv.hpp
@@@ -565,6 -586,7 +586,7 @@@ enum Scope 
      ScopeWorkgroup = 2,
      ScopeSubgroup = 3,
      ScopeInvocation = 4,
 -    ScopeQueueFamilyKHR = 5,\r
++    ScopeQueueFamilyKHR = 5,
      ScopeMax = 0x7fffffff,
  };
  
@@@ -708,6 -730,8 +730,8 @@@ enum Capability 
      CapabilityInputAttachmentArrayNonUniformIndexingEXT = 5310,
      CapabilityUniformTexelBufferArrayNonUniformIndexingEXT = 5311,
      CapabilityStorageTexelBufferArrayNonUniformIndexingEXT = 5312,
 -    CapabilityVulkanMemoryModelDeviceScopeKHR = 5346,\r
+     CapabilityVulkanMemoryModelKHR = 5345,
++    CapabilityVulkanMemoryModelDeviceScopeKHR = 5346,
      CapabilitySubgroupShuffleINTEL = 5568,
      CapabilitySubgroupBufferBlockIOINTEL = 5569,
      CapabilitySubgroupImageBlockIOINTEL = 5570,