Consistently include latest spirv.h header file.

Use indirection through latest_version_spirv.h

Also, when generating enum tables, use the unified1 JSON grammar since
it now has FragmentFullyCoveredEXT but the other JSON grammars don't.
They are starting to fall behind.

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 7512dc7..2d7d7ca 100644 (file)
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -134,9 +134,9 @@ endmacro(spvtools_extinst_lang_headers)
 spvtools_core_tables("1.0")
 spvtools_core_tables("1.1")
 spvtools_core_tables("1.2")
-spvtools_enum_string_mapping("1.2")
-spvtools_opencl_tables("1.2")
-spvtools_glsl_tables("1.2")
+spvtools_enum_string_mapping("unified1")
+spvtools_opencl_tables("unified1")
+spvtools_glsl_tables("unified1")
 spvtools_vendor_tables("spv-amd-shader-explicit-vertex-parameter")
 spvtools_vendor_tables("spv-amd-shader-trinary-minmax")
 spvtools_vendor_tables("spv-amd-gcn-shader")
@@ -144,7 +144,7 @@ spvtools_vendor_tables("spv-amd-shader-ballot")
 spvtools_vendor_tables("debuginfo")
 spvtools_extinst_lang_headers("DebugInfo" ${DEBUGINFO_GRAMMAR_JSON_FILE})
 
-spvtools_vimsyntax("1.2" "1.0")
+spvtools_vimsyntax("unified1" "1.0")
 add_custom_target(spirv-tools-vimsyntax DEPENDS ${VIMSYNTAX_FILE})
 set_property(TARGET spirv-tools-vimsyntax PROPERTY FOLDER "SPIRV-Tools utilities")
 

diff --git a/source/binary.cpp b/source/binary.cpp
index 10523e7..7ac5765 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -25,9 +25,9 @@
 #include "assembly_grammar.h"
 #include "diagnostic.h"
 #include "ext_inst.h"
+#include "latest_version_spirv_header.h"
 #include "opcode.h"
 #include "operand.h"
-#include "spirv/1.2/spirv.h"
 #include "spirv_constant.h"
 #include "spirv_endian.h"
 

diff --git a/source/enum_string_mapping.h b/source/enum_string_mapping.h
index 0345d5b..4b12681 100644 (file)
--- a/source/enum_string_mapping.h
+++ b/source/enum_string_mapping.h
@@ -17,9 +17,8 @@
 
 #include <string>
 
-#include "spirv/1.1/spirv.h"
-
 #include "extensions.h"
+#include "latest_version_spirv_header.h"
 
 namespace libspirv {
 

diff --git a/source/name_mapper.cpp b/source/name_mapper.cpp
index 8b25cb4..a8b5a7c 100644 (file)
--- a/source/name_mapper.cpp
+++ b/source/name_mapper.cpp
@@ -23,8 +23,8 @@
 #include <unordered_set>
 
 #include "spirv-tools/libspirv.h"
-#include "spirv/1.2/spirv.h"
 
+#include "latest_version_spirv_header.h"
 #include "parsed_operand.h"
 
 namespace {

diff --git a/source/opt/const_folding_rules.h b/source/opt/const_folding_rules.h
index fed69b3..2d9ecba 100644 (file)
--- a/source/opt/const_folding_rules.h
+++ b/source/opt/const_folding_rules.h
@@ -22,7 +22,7 @@
 #include "folding_rules.h"
 #include "ir_builder.h"
 #include "ir_context.h"
-#include "spirv/1.2/spirv.h"
+#include "latest_version_spirv_header.h"
 
 namespace spvtools {
 namespace opt {

diff --git a/tools/stats/stats_analyzer.cpp b/tools/stats/stats_analyzer.cpp
index da0b9e3..7ce56c9 100644 (file)
--- a/tools/stats/stats_analyzer.cpp
+++ b/tools/stats/stats_analyzer.cpp
@@ -23,13 +23,13 @@
 #include <unordered_set>
 #include <vector>
 
+#include "latest_version_spirv_header.h"
 #include "source/comp/markv_model.h"
 #include "source/enum_string_mapping.h"
 #include "source/opcode.h"
 #include "source/operand.h"
 #include "source/spirv_constant.h"
 #include "source/util/huffman_codec.h"
-#include "spirv/1.2/spirv.h"
 
 using libspirv::SpirvStats;
 using spvutils::HuffmanCodec;