Sync to rev. 7 of headers from Khronos.

diff --git a/include/spirv/unified1/spirv.cs b/include/spirv/unified1/spirv.cs
index b72e9d7..4b0a4ac 100644 (file)
--- a/include/spirv/unified1/spirv.cs
+++ b/include/spirv/unified1/spirv.cs
@@ -49,7 +49,7 @@ namespace Spv
     {
         public const uint MagicNumber = 0x07230203;
         public const uint Version = 0x00010300;
-        public const uint Revision = 6;
+        public const uint Revision = 7;
         public const uint OpCodeMask = 0xffff;
         public const uint WordCountShift = 16;
 

diff --git a/include/spirv/unified1/spirv.h b/include/spirv/unified1/spirv.h
index 4f6f792..f9ffbd5 100644 (file)
--- a/include/spirv/unified1/spirv.h
+++ b/include/spirv/unified1/spirv.h
@@ -54,11 +54,11 @@
 typedef unsigned int SpvId;
 
 #define SPV_VERSION 0x10300
-#define SPV_REVISION 6
+#define SPV_REVISION 7
 
 static const unsigned int SpvMagicNumber = 0x07230203;
 static const unsigned int SpvVersion = 0x00010300;
-static const unsigned int SpvRevision = 6;
+static const unsigned int SpvRevision = 7;
 static const unsigned int SpvOpCodeMask = 0xffff;
 static const unsigned int SpvWordCountShift = 16;
 
@@ -1330,5 +1330,5 @@ typedef enum SpvOp_ {
     SpvOpMax = 0x7fffffff,
 } SpvOp;
 
-#endif  // #ifndef spirv_H
+#endif
 

diff --git a/include/spirv/unified1/spirv.hpp b/include/spirv/unified1/spirv.hpp
index 332d41e..62c2dc9 100644 (file)
--- a/include/spirv/unified1/spirv.hpp
+++ b/include/spirv/unified1/spirv.hpp
@@ -50,11 +50,11 @@ namespace spv {
 typedef unsigned int Id;
 
 #define SPV_VERSION 0x10300
-#define SPV_REVISION 6
+#define SPV_REVISION 7
 
 static const unsigned int MagicNumber = 0x07230203;
 static const unsigned int Version = 0x00010300;
-static const unsigned int Revision = 6;
+static const unsigned int Revision = 7;
 static const unsigned int OpCodeMask = 0xffff;
 static const unsigned int WordCountShift = 16;
 

diff --git a/include/spirv/unified1/spirv.hpp11 b/include/spirv/unified1/spirv.hpp11
index c7a0982..8da7dac 100644 (file)
--- a/include/spirv/unified1/spirv.hpp11
+++ b/include/spirv/unified1/spirv.hpp11
@@ -50,11 +50,11 @@ namespace spv {
 typedef unsigned int Id;
 
 #define SPV_VERSION 0x10300
-#define SPV_REVISION 6
+#define SPV_REVISION 7
 
 static const unsigned int MagicNumber = 0x07230203;
 static const unsigned int Version = 0x00010300;
-static const unsigned int Revision = 6;
+static const unsigned int Revision = 7;
 static const unsigned int OpCodeMask = 0xffff;
 static const unsigned int WordCountShift = 16;
 

diff --git a/include/spirv/unified1/spirv.json b/include/spirv/unified1/spirv.json
index 0c9ccc4..876449e 100644 (file)
--- a/include/spirv/unified1/spirv.json
+++ b/include/spirv/unified1/spirv.json
@@ -55,7 +55,7 @@
             ],
             "MagicNumber": 119734787,
             "Version": 66304,
-            "Revision": 6,
+            "Revision": 7,
             "OpCodeMask": 65535,
             "WordCountShift": 16
         },

diff --git a/include/spirv/unified1/spirv.lua b/include/spirv/unified1/spirv.lua
index ec7bd7a..820393c 100644 (file)
--- a/include/spirv/unified1/spirv.lua
+++ b/include/spirv/unified1/spirv.lua
@@ -45,7 +45,7 @@
 spv = {
     MagicNumber = 0x07230203,
     Version = 0x00010300,
-    Revision = 6,
+    Revision = 7,
     OpCodeMask = 0xffff,
     WordCountShift = 16,
 

diff --git a/include/spirv/unified1/spirv.py b/include/spirv/unified1/spirv.py
index 8234cc3..e44040b 100644 (file)
--- a/include/spirv/unified1/spirv.py
+++ b/include/spirv/unified1/spirv.py
@@ -45,7 +45,7 @@
 spv = {
     'MagicNumber' : 0x07230203,
     'Version' : 0x00010300,
-    'Revision' : 6,
+    'Revision' : 7,
     'OpCodeMask' : 0xffff,
     'WordCountShift' : 16,
 

diff --git a/include/spirv/unified1/spv.d b/include/spirv/unified1/spv.d
index 0fec0d4..0b6faff 100644 (file)
--- a/include/spirv/unified1/spv.d
+++ b/include/spirv/unified1/spv.d
@@ -52,7 +52,7 @@ module spv;
 
 enum uint MagicNumber = 0x07230203;
 enum uint Version = 0x00010300;
-enum uint Revision = 6;
+enum uint Revision = 7;
 enum uint OpCodeMask = 0xffff;
 enum uint WordCountShift = 16;
 

diff --git a/tools/buildHeaders/header.cpp b/tools/buildHeaders/header.cpp
index faf0b9d..56ff111 100755 (executable)
--- a/tools/buildHeaders/header.cpp
+++ b/tools/buildHeaders/header.cpp
@@ -69,8 +69,8 @@ namespace {
 
         static const int         DocMagicNumber = 0x07230203;
         static const int         DocVersion     = 0x00010300;
-        static const int         DocRevision    = 6;
-        #define DocRevisionString                "6"
+        static const int         DocRevision    = 7;
+        #define DocRevisionString                "7"
         static const std::string DocCopyright;
         static const std::string DocComment1;
         static const std::string DocComment2;