From 81f4c03a767d1ff802ceaf345154b80f2b836b2f Mon Sep 17 00:00:00 2001 From: Rex Xu Date: Fri, 2 Mar 2018 17:42:37 +0800 Subject: [PATCH] Fix issues of SPIRV headers --- SPIRV/CMakeLists.txt | 1 + SPIRV/GLSL.ext.EXT.h | 6 ++---- SPIRV/GLSL.ext.KHR.h | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index b1c02777..b6824192 100755 --- a/SPIRV/CMakeLists.txt +++ b/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 diff --git a/SPIRV/GLSL.ext.EXT.h b/SPIRV/GLSL.ext.EXT.h index e879714d..c4a24308 100644 --- a/SPIRV/GLSL.ext.EXT.h +++ b/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 diff --git a/SPIRV/GLSL.ext.KHR.h b/SPIRV/GLSL.ext.KHR.h index 2eb10ae6..d8ea9b67 100644 --- a/SPIRV/GLSL.ext.KHR.h +++ b/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 -- 2.34.1