Lei Zhang · John Kessenich · Rex Xu · John Kessenich · John Kessenich · John Kessenich
--- a/README.md
+++ b/README.md
@@ -71,10 +71,11 @@ However, the project for the tool to do this is included in this repository,
 and can be used to test a PR, or even to include the results in the PR.
 This is not required though.

-The header-generation project is under the `buildHeaders` directory.
-Use CMake to build the project, in a `buildHeaders/build` subdirectory.
-There is a bash script at `buildHeaders/bin/makeHeaders` that shows how to use the built
+The header-generation project is under the `tools/buildHeaders` directory.
+Use CMake to build the project, in a `build` subdirectory (under `tools/buildHeaders`).
+There is then a bash script at `bin/makeHeaders` that shows how to use the built
 header-generator binary to generate the headers from the JSON grammar.
+(Execute `bin/makeHeaders` from the `tools/buildHeaders` directory.)

 Notes:
 - this generator is used in a broader context within Khronos to generate the specification,

--- a/debian/changelog
+++ b/debian/changelog
+spirv-headers (1.3-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+    - although upstream hasn't tagged it as such, use the spec version
+  * control: Update the description.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Sat, 10 Mar 2018 10:14:36 +0200
+
 spirv-headers (0+git20180201.ce3092-1) unstable; urgency=medium

  * Initial release (Closes: #891052)

--- a/debian/control
+++ b/debian/control
@@ -17,3 +17,5 @@ Description: Machine-readable files for the SPIR-V Registry
  - JSON files describing the grammar for the SPIR-V core instruction
    set and the extended instruction sets.
  - The XML registry file.
+ .
+ For more info, see https://github.com/KhronosGroup/SPIRV-Headers
--- a/include/spirv/1.0/spirv.core.grammar.json
+++ b/include/spirv/1.0/spirv.core.grammar.json
@@ -3012,6 +3012,15 @@
      ],
      "capabilities" : [ "SparseResidency" ]
    },
+    {
+      "opname" : "OpDecorateId",
+      "opcode" : 332,
+      "operands" : [
+        { "kind" : "IdRef", "name" : "'Target'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
+    },
    {
      "opname" : "OpSubgroupBallotKHR",
      "opcode" : 4421,
@@ -3277,6 +3286,25 @@
        { "kind" : "IdRef", "name" : "'Data'" }
      ],
      "capabilities" : [ "SubgroupImageBlockIOINTEL" ]
+    },
+    {
+      "opname" : "OpDecorateStringGOOGLE",
+      "opcode" : 5632,
+      "operands" : [
+        { "kind" : "IdRef",         "name" : "'Target'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
+    },
+    {
+      "opname" : "OpMemberDecorateStringGOOGLE",
+      "opcode" : 5633,
+      "operands" : [
+        { "kind" : "IdRef",          "name" : "'Struct Type'" },
+        { "kind" : "LiteralInteger", "name" : "'Member'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
    }
  ],
  "operand_kinds" : [
@@ -4836,6 +4864,22 @@
          "parameters" : [
            { "kind" : "LiteralInteger", "name" : "'Offset'" }
          ]
+        },
+        {
+          "enumerant" : "HlslCounterBufferGOOGLE",
+          "value" : 5634,
+          "parameters" : [
+            { "kind" : "IdRef", "name" : "'Counter Buffer'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
+        },
+        {
+          "enumerant" : "HlslSemanticGOOGLE",
+          "value" : 5635,
+          "parameters" : [
+            { "kind" : "LiteralString", "name" : "'Semantic'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
        }
      ]
    },
@@ -5005,7 +5049,7 @@
        {
          "enumerant" : "SubgroupSize",
          "value" : 36,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "SubgroupMaxSize",
@@ -5030,7 +5074,7 @@
        {
          "enumerant" : "SubgroupLocalInvocationId",
          "value" : 41,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "VertexIndex",

--- a/include/spirv/1.0/spirv.h
+++ b/include/spirv/1.0/spirv.h
 /*
-** Copyright (c) 2014-2017 The Khronos Group Inc.
+** Copyright (c) 2014-2018 The Khronos Group Inc.
 ** 
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
@@ -387,6 +387,8 @@ typedef enum SpvDecoration_ {
    SpvDecorationPassthroughNV = 5250,
    SpvDecorationViewportRelativeNV = 5252,
    SpvDecorationSecondaryViewportRelativeNV = 5256,
+    SpvDecorationHlslCounterBufferGOOGLE = 5634,
+    SpvDecorationHlslSemanticGOOGLE = 5635,
    SpvDecorationMax = 0x7fffffff,
 } SpvDecoration;

@@ -957,6 +959,7 @@ typedef enum SpvOp_ {
    SpvOpAtomicFlagTestAndSet = 318,
    SpvOpAtomicFlagClear = 319,
    SpvOpImageSparseRead = 320,
+    SpvOpDecorateId = 332,
    SpvOpSubgroupBallotKHR = 4421,
    SpvOpSubgroupFirstInvocationKHR = 4422,
    SpvOpSubgroupAllKHR = 4428,
@@ -981,6 +984,8 @@ typedef enum SpvOp_ {
    SpvOpSubgroupBlockWriteINTEL = 5576,
    SpvOpSubgroupImageBlockReadINTEL = 5577,
    SpvOpSubgroupImageBlockWriteINTEL = 5578,
+    SpvOpDecorateStringGOOGLE = 5632,
+    SpvOpMemberDecorateStringGOOGLE = 5633,
    SpvOpMax = 0x7fffffff,
 } SpvOp;


--- a/include/spirv/1.0/spirv.hpp
+++ b/include/spirv/1.0/spirv.hpp
-// Copyright (c) 2014-2017 The Khronos Group Inc.
+// Copyright (c) 2014-2018 The Khronos Group Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and/or associated documentation files (the "Materials"),
@@ -383,6 +383,8 @@ enum Decoration {
    DecorationPassthroughNV = 5250,
    DecorationViewportRelativeNV = 5252,
    DecorationSecondaryViewportRelativeNV = 5256,
+    DecorationHlslCounterBufferGOOGLE = 5634,
+    DecorationHlslSemanticGOOGLE = 5635,
    DecorationMax = 0x7fffffff,
 };

@@ -953,6 +955,7 @@ enum Op {
    OpAtomicFlagTestAndSet = 318,
    OpAtomicFlagClear = 319,
    OpImageSparseRead = 320,
+    OpDecorateId = 332,
    OpSubgroupBallotKHR = 4421,
    OpSubgroupFirstInvocationKHR = 4422,
    OpSubgroupAllKHR = 4428,
@@ -977,6 +980,8 @@ enum Op {
    OpSubgroupBlockWriteINTEL = 5576,
    OpSubgroupImageBlockReadINTEL = 5577,
    OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
    OpMax = 0x7fffffff,
 };


--- a/include/spirv/1.0/spirv.hpp11
+++ b/include/spirv/1.0/spirv.hpp11
-// Copyright (c) 2014-2017 The Khronos Group Inc.
+// Copyright (c) 2014-2018 The Khronos Group Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and/or associated documentation files (the "Materials"),
@@ -383,6 +383,8 @@ enum class Decoration : unsigned {
    PassthroughNV = 5250,
    ViewportRelativeNV = 5252,
    SecondaryViewportRelativeNV = 5256,
+    HlslCounterBufferGOOGLE = 5634,
+    HlslSemanticGOOGLE = 5635,
    Max = 0x7fffffff,
 };

@@ -953,6 +955,7 @@ enum class Op : unsigned {
    OpAtomicFlagTestAndSet = 318,
    OpAtomicFlagClear = 319,
    OpImageSparseRead = 320,
+    OpDecorateId = 332,
    OpSubgroupBallotKHR = 4421,
    OpSubgroupFirstInvocationKHR = 4422,
    OpSubgroupAllKHR = 4428,
@@ -977,6 +980,8 @@ enum class Op : unsigned {
    OpSubgroupBlockWriteINTEL = 5576,
    OpSubgroupImageBlockReadINTEL = 5577,
    OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
    Max = 0x7fffffff,
 };


--- a/include/spirv/1.0/spirv.json
+++ b/include/spirv/1.0/spirv.json
@@ -6,7 +6,7 @@
            "Comment":
            [
                [
-                    "Copyright (c) 2014-2017 The Khronos Group Inc.",
+                    "Copyright (c) 2014-2018 The Khronos Group Inc.",
                    "",
                    "Permission is hereby granted, free of charge, to any person obtaining a copy",
                    "of this software and/or associated documentation files (the \"Materials\"),",
@@ -422,7 +422,9 @@
                    "OverrideCoverageNV": 5248,
                    "PassthroughNV": 5250,
                    "ViewportRelativeNV": 5252,
-                    "SecondaryViewportRelativeNV": 5256
+                    "SecondaryViewportRelativeNV": 5256,
+                    "HlslCounterBufferGOOGLE": 5634,
+                    "HlslSemanticGOOGLE": 5635
                }
            },
            {
@@ -983,6 +985,7 @@
                    "OpAtomicFlagTestAndSet": 318,
                    "OpAtomicFlagClear": 319,
                    "OpImageSparseRead": 320,
+                    "OpDecorateId": 332,
                    "OpSubgroupBallotKHR": 4421,
                    "OpSubgroupFirstInvocationKHR": 4422,
                    "OpSubgroupAllKHR": 4428,
@@ -1006,7 +1009,9 @@
                    "OpSubgroupBlockReadINTEL": 5575,
                    "OpSubgroupBlockWriteINTEL": 5576,
                    "OpSubgroupImageBlockReadINTEL": 5577,
-                    "OpSubgroupImageBlockWriteINTEL": 5578
+                    "OpSubgroupImageBlockWriteINTEL": 5578,
+                    "OpDecorateStringGOOGLE": 5632,
+                    "OpMemberDecorateStringGOOGLE": 5633
                }
            }
        ]

--- a/include/spirv/1.0/spirv.lua
+++ b/include/spirv/1.0/spirv.lua
-- Copyright (c) 2014-2017 The Khronos Group Inc.
+-- Copyright (c) 2014-2018 The Khronos Group Inc.
 -- 
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and/or associated documentation files (the "Materials"),
@@ -356,6 +356,8 @@ spv = {
        PassthroughNV = 5250,
        ViewportRelativeNV = 5252,
        SecondaryViewportRelativeNV = 5256,
+        HlslCounterBufferGOOGLE = 5634,
+        HlslSemanticGOOGLE = 5635,
    },

    BuiltIn = {
@@ -914,6 +916,7 @@ spv = {
        OpAtomicFlagTestAndSet = 318,
        OpAtomicFlagClear = 319,
        OpImageSparseRead = 320,
+        OpDecorateId = 332,
        OpSubgroupBallotKHR = 4421,
        OpSubgroupFirstInvocationKHR = 4422,
        OpSubgroupAllKHR = 4428,
@@ -938,6 +941,8 @@ spv = {
        OpSubgroupBlockWriteINTEL = 5576,
        OpSubgroupImageBlockReadINTEL = 5577,
        OpSubgroupImageBlockWriteINTEL = 5578,
+        OpDecorateStringGOOGLE = 5632,
+        OpMemberDecorateStringGOOGLE = 5633,
    },

 }

--- a/include/spirv/1.0/spirv.py
+++ b/include/spirv/1.0/spirv.py
-# Copyright (c) 2014-2017 The Khronos Group Inc.
+# Copyright (c) 2014-2018 The Khronos Group Inc.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and/or associated documentation files (the "Materials"),
@@ -356,6 +356,8 @@ spv = {
        'PassthroughNV' : 5250,
        'ViewportRelativeNV' : 5252,
        'SecondaryViewportRelativeNV' : 5256,
+        'HlslCounterBufferGOOGLE' : 5634,
+        'HlslSemanticGOOGLE' : 5635,
    },

    'BuiltIn' : {
@@ -914,6 +916,7 @@ spv = {
        'OpAtomicFlagTestAndSet' : 318,
        'OpAtomicFlagClear' : 319,
        'OpImageSparseRead' : 320,
+        'OpDecorateId' : 332,
        'OpSubgroupBallotKHR' : 4421,
        'OpSubgroupFirstInvocationKHR' : 4422,
        'OpSubgroupAllKHR' : 4428,
@@ -938,6 +941,8 @@ spv = {
        'OpSubgroupBlockWriteINTEL' : 5576,
        'OpSubgroupImageBlockReadINTEL' : 5577,
        'OpSubgroupImageBlockWriteINTEL' : 5578,
+        'OpDecorateStringGOOGLE' : 5632,
+        'OpMemberDecorateStringGOOGLE' : 5633,
    },

 }

--- a/include/spirv/1.1/spirv.core.grammar.json
+++ b/include/spirv/1.1/spirv.core.grammar.json
@@ -3114,6 +3114,15 @@
        { "kind" : "LiteralString", "name" : "'Process'" }
      ]
    },
+    {
+      "opname" : "OpDecorateId",
+      "opcode" : 332,
+      "operands" : [
+        { "kind" : "IdRef", "name" : "'Target'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
+    },
    {
      "opname" : "OpSubgroupBallotKHR",
      "opcode" : 4421,
@@ -3379,6 +3388,25 @@
        { "kind" : "IdRef", "name" : "'Data'" }
      ],
      "capabilities" : [ "SubgroupImageBlockIOINTEL" ]
+    },
+    {
+      "opname" : "OpDecorateStringGOOGLE",
+      "opcode" : 5632,
+      "operands" : [
+        { "kind" : "IdRef",         "name" : "'Target'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
+    },
+    {
+      "opname" : "OpMemberDecorateStringGOOGLE",
+      "opcode" : 5633,
+      "operands" : [
+        { "kind" : "IdRef",          "name" : "'Struct Type'" },
+        { "kind" : "LiteralInteger", "name" : "'Member'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
    }
  ],
  "operand_kinds" : [
@@ -4984,6 +5012,22 @@
          "parameters" : [
            { "kind" : "LiteralInteger", "name" : "'Offset'" }
          ]
+        },
+        {
+          "enumerant" : "HlslCounterBufferGOOGLE",
+          "value" : 5634,
+          "parameters" : [
+            { "kind" : "IdRef", "name" : "'Counter Buffer'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
+        },
+        {
+          "enumerant" : "HlslSemanticGOOGLE",
+          "value" : 5635,
+          "parameters" : [
+            { "kind" : "LiteralString", "name" : "'Semantic'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
        }
      ]
    },
@@ -5153,7 +5197,7 @@
        {
          "enumerant" : "SubgroupSize",
          "value" : 36,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "SubgroupMaxSize",
@@ -5178,7 +5222,7 @@
        {
          "enumerant" : "SubgroupLocalInvocationId",
          "value" : 41,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "VertexIndex",

--- a/include/spirv/1.1/spirv.h
+++ b/include/spirv/1.1/spirv.h
 /*
-** Copyright (c) 2014-2017 The Khronos Group Inc.
+** Copyright (c) 2014-2018 The Khronos Group Inc.
 ** 
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
@@ -392,6 +392,8 @@ typedef enum SpvDecoration_ {
    SpvDecorationPassthroughNV = 5250,
    SpvDecorationViewportRelativeNV = 5252,
    SpvDecorationSecondaryViewportRelativeNV = 5256,
+    SpvDecorationHlslCounterBufferGOOGLE = 5634,
+    SpvDecorationHlslSemanticGOOGLE = 5635,
    SpvDecorationMax = 0x7fffffff,
 } SpvDecoration;

@@ -979,6 +981,7 @@ typedef enum SpvOp_ {
    SpvOpNamedBarrierInitialize = 328,
    SpvOpMemoryNamedBarrier = 329,
    SpvOpModuleProcessed = 330,
+    SpvOpDecorateId = 332,
    SpvOpSubgroupBallotKHR = 4421,
    SpvOpSubgroupFirstInvocationKHR = 4422,
    SpvOpSubgroupAllKHR = 4428,
@@ -1003,6 +1006,8 @@ typedef enum SpvOp_ {
    SpvOpSubgroupBlockWriteINTEL = 5576,
    SpvOpSubgroupImageBlockReadINTEL = 5577,
    SpvOpSubgroupImageBlockWriteINTEL = 5578,
+    SpvOpDecorateStringGOOGLE = 5632,
+    SpvOpMemberDecorateStringGOOGLE = 5633,
    SpvOpMax = 0x7fffffff,
 } SpvOp;


--- a/include/spirv/1.1/spirv.hpp
+++ b/include/spirv/1.1/spirv.hpp
-// Copyright (c) 2014-2017 The Khronos Group Inc.
+// Copyright (c) 2014-2018 The Khronos Group Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and/or associated documentation files (the "Materials"),
@@ -388,6 +388,8 @@ enum Decoration {
    DecorationPassthroughNV = 5250,
    DecorationViewportRelativeNV = 5252,
    DecorationSecondaryViewportRelativeNV = 5256,
+    DecorationHlslCounterBufferGOOGLE = 5634,
+    DecorationHlslSemanticGOOGLE = 5635,
    DecorationMax = 0x7fffffff,
 };

@@ -975,6 +977,7 @@ enum Op {
    OpNamedBarrierInitialize = 328,
    OpMemoryNamedBarrier = 329,
    OpModuleProcessed = 330,
+    OpDecorateId = 332,
    OpSubgroupBallotKHR = 4421,
    OpSubgroupFirstInvocationKHR = 4422,
    OpSubgroupAllKHR = 4428,
@@ -999,6 +1002,8 @@ enum Op {
    OpSubgroupBlockWriteINTEL = 5576,
    OpSubgroupImageBlockReadINTEL = 5577,
    OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
    OpMax = 0x7fffffff,
 };


--- a/include/spirv/1.1/spirv.hpp11
+++ b/include/spirv/1.1/spirv.hpp11
-// Copyright (c) 2014-2017 The Khronos Group Inc.
+// Copyright (c) 2014-2018 The Khronos Group Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and/or associated documentation files (the "Materials"),
@@ -388,6 +388,8 @@ enum class Decoration : unsigned {
    PassthroughNV = 5250,
    ViewportRelativeNV = 5252,
    SecondaryViewportRelativeNV = 5256,
+    HlslCounterBufferGOOGLE = 5634,
+    HlslSemanticGOOGLE = 5635,
    Max = 0x7fffffff,
 };

@@ -975,6 +977,7 @@ enum class Op : unsigned {
    OpNamedBarrierInitialize = 328,
    OpMemoryNamedBarrier = 329,
    OpModuleProcessed = 330,
+    OpDecorateId = 332,
    OpSubgroupBallotKHR = 4421,
    OpSubgroupFirstInvocationKHR = 4422,
    OpSubgroupAllKHR = 4428,
@@ -999,6 +1002,8 @@ enum class Op : unsigned {
    OpSubgroupBlockWriteINTEL = 5576,
    OpSubgroupImageBlockReadINTEL = 5577,
    OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
    Max = 0x7fffffff,
 };


--- a/include/spirv/1.1/spirv.json
+++ b/include/spirv/1.1/spirv.json
@@ -6,7 +6,7 @@
            "Comment":
            [
                [
-                    "Copyright (c) 2014-2017 The Khronos Group Inc.",
+                    "Copyright (c) 2014-2018 The Khronos Group Inc.",
                    "",
                    "Permission is hereby granted, free of charge, to any person obtaining a copy",
                    "of this software and/or associated documentation files (the \"Materials\"),",
@@ -427,7 +427,9 @@
                    "OverrideCoverageNV": 5248,
                    "PassthroughNV": 5250,
                    "ViewportRelativeNV": 5252,
-                    "SecondaryViewportRelativeNV": 5256
+                    "SecondaryViewportRelativeNV": 5256,
+                    "HlslCounterBufferGOOGLE": 5634,
+                    "HlslSemanticGOOGLE": 5635
                }
            },
            {
@@ -1003,6 +1005,7 @@
                    "OpNamedBarrierInitialize": 328,
                    "OpMemoryNamedBarrier": 329,
                    "OpModuleProcessed": 330,
+                    "OpDecorateId": 332,
                    "OpSubgroupBallotKHR": 4421,
                    "OpSubgroupFirstInvocationKHR": 4422,
                    "OpSubgroupAllKHR": 4428,
@@ -1026,7 +1029,9 @@
                    "OpSubgroupBlockReadINTEL": 5575,
                    "OpSubgroupBlockWriteINTEL": 5576,
                    "OpSubgroupImageBlockReadINTEL": 5577,
-                    "OpSubgroupImageBlockWriteINTEL": 5578
+                    "OpSubgroupImageBlockWriteINTEL": 5578,
+                    "OpDecorateStringGOOGLE": 5632,
+                    "OpMemberDecorateStringGOOGLE": 5633
                }
            }
        ]

--- a/include/spirv/1.1/spirv.lua
+++ b/include/spirv/1.1/spirv.lua
-- Copyright (c) 2014-2017 The Khronos Group Inc.
+-- Copyright (c) 2014-2018 The Khronos Group Inc.
 -- 
 -- Permission is hereby granted, free of charge, to any person obtaining a copy
 -- of this software and/or associated documentation files (the "Materials"),
@@ -361,6 +361,8 @@ spv = {
        PassthroughNV = 5250,
        ViewportRelativeNV = 5252,
        SecondaryViewportRelativeNV = 5256,
+        HlslCounterBufferGOOGLE = 5634,
+        HlslSemanticGOOGLE = 5635,
    },

    BuiltIn = {
@@ -936,6 +938,7 @@ spv = {
        OpNamedBarrierInitialize = 328,
        OpMemoryNamedBarrier = 329,
        OpModuleProcessed = 330,
+        OpDecorateId = 332,
        OpSubgroupBallotKHR = 4421,
        OpSubgroupFirstInvocationKHR = 4422,
        OpSubgroupAllKHR = 4428,
@@ -960,6 +963,8 @@ spv = {
        OpSubgroupBlockWriteINTEL = 5576,
        OpSubgroupImageBlockReadINTEL = 5577,
        OpSubgroupImageBlockWriteINTEL = 5578,
+        OpDecorateStringGOOGLE = 5632,
+        OpMemberDecorateStringGOOGLE = 5633,
    },

 }

--- a/include/spirv/1.1/spirv.py
+++ b/include/spirv/1.1/spirv.py
-# Copyright (c) 2014-2017 The Khronos Group Inc.
+# Copyright (c) 2014-2018 The Khronos Group Inc.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and/or associated documentation files (the "Materials"),
@@ -361,6 +361,8 @@ spv = {
        'PassthroughNV' : 5250,
        'ViewportRelativeNV' : 5252,
        'SecondaryViewportRelativeNV' : 5256,
+        'HlslCounterBufferGOOGLE' : 5634,
+        'HlslSemanticGOOGLE' : 5635,
    },

    'BuiltIn' : {
@@ -936,6 +938,7 @@ spv = {
        'OpNamedBarrierInitialize' : 328,
        'OpMemoryNamedBarrier' : 329,
        'OpModuleProcessed' : 330,
+        'OpDecorateId' : 332,
        'OpSubgroupBallotKHR' : 4421,
        'OpSubgroupFirstInvocationKHR' : 4422,
        'OpSubgroupAllKHR' : 4428,
@@ -960,6 +963,8 @@ spv = {
        'OpSubgroupBlockWriteINTEL' : 5576,
        'OpSubgroupImageBlockReadINTEL' : 5577,
        'OpSubgroupImageBlockWriteINTEL' : 5578,
+        'OpDecorateStringGOOGLE' : 5632,
+        'OpMemberDecorateStringGOOGLE' : 5633,
    },

 }

--- a/include/spirv/1.2/spirv.core.grammar.json
+++ b/include/spirv/1.2/spirv.core.grammar.json
@@ -3395,6 +3395,25 @@
        { "kind" : "IdRef", "name" : "'Data'" }
      ],
      "capabilities" : [ "SubgroupImageBlockIOINTEL" ]
+    },
+    {
+      "opname" : "OpDecorateStringGOOGLE",
+      "opcode" : 5632,
+      "operands" : [
+        { "kind" : "IdRef",         "name" : "'Target'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
+    },
+    {
+      "opname" : "OpMemberDecorateStringGOOGLE",
+      "opcode" : 5633,
+      "operands" : [
+        { "kind" : "IdRef",          "name" : "'Struct Type'" },
+        { "kind" : "LiteralInteger", "name" : "'Member'" },
+        { "kind" : "Decoration" }
+      ],
+      "extensions" : [ "SPV_GOOGLE_decorate_string" ]
    }
  ],
  "operand_kinds" : [
@@ -5041,6 +5060,22 @@
          "parameters" : [
            { "kind" : "LiteralInteger", "name" : "'Offset'" }
          ]
+        },
+        {
+          "enumerant" : "HlslCounterBufferGOOGLE",
+          "value" : 5634,
+          "parameters" : [
+            { "kind" : "IdRef", "name" : "'Counter Buffer'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
+        },
+        {
+          "enumerant" : "HlslSemanticGOOGLE",
+          "value" : 5635,
+          "parameters" : [
+            { "kind" : "LiteralString", "name" : "'Semantic'" }
+          ],
+          "extensions" : [ "SPV_GOOGLE_hlsl_functionality1" ]
        }
      ]
    },
@@ -5210,7 +5245,7 @@
        {
          "enumerant" : "SubgroupSize",
          "value" : 36,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "SubgroupMaxSize",
@@ -5235,7 +5270,7 @@
        {
          "enumerant" : "SubgroupLocalInvocationId",
          "value" : 41,
-          "capabilities" : [ "Kernel" ]
+          "capabilities" : [ "Kernel", "SubgroupBallotKHR" ]
        },
        {
          "enumerant" : "VertexIndex",

--- a/include/spirv/1.2/spirv.h
+++ b/include/spirv/1.2/spirv.h
 /*
-** Copyright (c) 2014-2017 The Khronos Group Inc.
+** Copyright (c) 2014-2018 The Khronos Group Inc.
 ** 
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
@@ -397,6 +397,8 @@ typedef enum SpvDecoration_ {
    SpvDecorationPassthroughNV = 5250,
    SpvDecorationViewportRelativeNV = 5252,
    SpvDecorationSecondaryViewportRelativeNV = 5256,
+    SpvDecorationHlslCounterBufferGOOGLE = 5634,
+    SpvDecorationHlslSemanticGOOGLE = 5635,
    SpvDecorationMax = 0x7fffffff,
 } SpvDecoration;

@@ -1010,6 +1012,8 @@ typedef enum SpvOp_ {
    SpvOpSubgroupBlockWriteINTEL = 5576,
    SpvOpSubgroupImageBlockReadINTEL = 5577,
    SpvOpSubgroupImageBlockWriteINTEL = 5578,
+    SpvOpDecorateStringGOOGLE = 5632,
+    SpvOpMemberDecorateStringGOOGLE = 5633,
    SpvOpMax = 0x7fffffff,
 } SpvOp;


--- a/include/spirv/1.2/spirv.hpp
+++ b/include/spirv/1.2/spirv.hpp
-// Copyright (c) 2014-2017 The Khronos Group Inc.
+// Copyright (c) 2014-2018 The Khronos Group Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and/or associated documentation files (the "Materials"),
@@ -393,6 +393,8 @@ enum Decoration {
    DecorationPassthroughNV = 5250,
    DecorationViewportRelativeNV = 5252,
    DecorationSecondaryViewportRelativeNV = 5256,
+    DecorationHlslCounterBufferGOOGLE = 5634,
+    DecorationHlslSemanticGOOGLE = 5635,
    DecorationMax = 0x7fffffff,
 };

@@ -1006,6 +1008,8 @@ enum Op {
    OpSubgroupBlockWriteINTEL = 5576,
    OpSubgroupImageBlockReadINTEL = 5577,
    OpSubgroupImageBlockWriteINTEL = 5578,
+    OpDecorateStringGOOGLE = 5632,
+    OpMemberDecorateStringGOOGLE = 5633,
    OpMax = 0x7fffffff,
 };