From e58d58b7827b4d4db3997103ad6976b0f7ecd0dd Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Fri, 2 Mar 2018 12:36:02 -0700
Subject: [PATCH] Non-functional: Move to latest headers.

---
 SPIRV/GLSL.ext.AMD.h | 3 ---
 SPIRV/spirv.hpp      | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SPIRV/GLSL.ext.AMD.h b/SPIRV/GLSL.ext.AMD.h
index e20642b3d..009d2f1cf 100644
--- a/SPIRV/GLSL.ext.AMD.h
+++ b/SPIRV/GLSL.ext.AMD.h
@@ -105,7 +105,4 @@ static const char* const E_SPV_AMD_shader_fragment_mask = "SPV_AMD_shader_fragme
 // SPV_AMD_gpu_shader_half_float_fetch
 static const char* const E_SPV_AMD_gpu_shader_half_float_fetch = "SPV_AMD_gpu_shader_half_float_fetch";
 
-enum Capability;
-static const Capability CapabilityFloat16ImageAMD = static_cast<Capability>(5008);
-
 #endif  // #ifndef GLSLextAMD_H
diff --git a/SPIRV/spirv.hpp b/SPIRV/spirv.hpp
index c6776638e..f6227a104 100755
--- a/SPIRV/spirv.hpp
+++ b/SPIRV/spirv.hpp
@@ -393,6 +393,8 @@ enum Decoration {
     DecorationPassthroughNV = 5250,
     DecorationViewportRelativeNV = 5252,
     DecorationSecondaryViewportRelativeNV = 5256,
+    DecorationHlslCounterBufferGOOGLE = 5634,
+    DecorationHlslSemanticGOOGLE = 5635,
     DecorationMax = 0x7fffffff,
 };
 
@@ -659,6 +661,7 @@ enum Capability {
     CapabilityVariablePointers = 4442,
     CapabilityAtomicStorageOps = 4445,
     CapabilitySampleMaskPostDepthCoverage = 4447,
+    CapabilityFloat16ImageAMD = 5008,
     CapabilityImageGatherBiasLodAMD = 5009,
     CapabilityFragmentMaskAMD = 5010,
     CapabilityStencilExportEXT = 5013,
@@ -1008,6 +1011,8 @@ enum Op {
     OpSubgroupBlockWriteINTEL = 5576,
     OpSubgroupImageBlockReadINTEL = 5577,
     OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
     OpMax = 0x7fffffff,
 };