Merge pull request #1268 from amdrexu/bugfix2

Fix issues of SPIRV headers

SPIRV/CMakeLists.txt

@@ -14,6 +14,7 @@ set(HEADERS
     bitutils.h
     spirv.hpp
     GLSL.std.450.h
+    GLSL.ext.EXT.h
     GLSL.ext.KHR.h
     GlslangToSpv.h
     hex_float.h

SPIRV/GLSL.ext.EXT.h

@@ -27,13 +27,11 @@
 #ifndef GLSLextEXT_H
 #define GLSLextEXT_H
 
-enum BuiltIn;
-enum Op;
-enum Capability;
-
 static const int GLSLextEXTVersion = 100;
 static const int GLSLextEXTRevision = 1;
 
+static const char* const E_SPV_EXT_shader_stencil_export        = "SPV_EXT_shader_stencil_export";
+static const char* const E_SPV_EXT_shader_viewport_index_layer  = "SPV_EXT_shader_viewport_index_layer";
 static const char* const E_SPV_EXT_fragment_fully_covered = "SPV_EXT_fragment_fully_covered";
 
 #endif  // #ifndef GLSLextEXT_H

SPIRV/GLSL.ext.KHR.h

@@ -27,10 +27,6 @@
 #ifndef GLSLextKHR_H
 #define GLSLextKHR_H
 
-enum BuiltIn;
-enum Op;
-enum Capability;
-
 static const int GLSLextKHRVersion = 100;
 static const int GLSLextKHRRevision = 2;
 
@@ -42,7 +38,5 @@ static const char* const E_SPV_KHR_shader_draw_parameters       = "SPV_KHR_shade
 static const char* const E_SPV_KHR_16bit_storage                = "SPV_KHR_16bit_storage";
 static const char* const E_SPV_KHR_storage_buffer_storage_class = "SPV_KHR_storage_buffer_storage_class";
 static const char* const E_SPV_KHR_post_depth_coverage          = "SPV_KHR_post_depth_coverage";
-static const char* const E_SPV_EXT_shader_stencil_export        = "SPV_EXT_shader_stencil_export";
-static const char* const E_SPV_EXT_shader_viewport_index_layer  = "SPV_EXT_shader_viewport_index_layer";
 
 #endif  // #ifndef GLSLextKHR_H