glslang GLSL -> SPIR-V: Final delta to bump to revision 30 of the specification.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@30488 e7fa87d3-cd2b-0410-9028-fcbf551c1848

SPIRV/doc.cpp

@@ -317,29 +317,29 @@ const char* DimensionString(int dim)
     }
 }
 
-const int SamplerAddressingModeCeiling = 9;
+const int SamplerAddressingModeCeiling = 5;
 
 const char* SamplerAddressingModeString(int mode)
 {
     switch (mode) {
     case 0:  return "None";
-    case 2:  return "ClampToEdge";
+    case 1:  return "ClampToEdge";
-    case 4:  return "Clamp";
+    case 2:  return "Clamp";
-    case 6:  return "Repeat";
+    case 3:  return "Repeat";
-    case 8:  return "RepeatMirrored";
+    case 4:  return "RepeatMirrored";
 
     case SamplerAddressingModeCeiling:
     default: return "Bad";
     }
 }
 
-const int SamplerFilterModeCeiling = 0x21;
+const int SamplerFilterModeCeiling = 2;
 
 const char* SamplerFilterModeString(int mode)
 {
     switch (mode) {
-    case 0x10: return "Nearest";
+    case 0: return "Nearest";
-    case 0x20: return "Linear";
+    case 1: return "Linear";
 
     case SamplerFilterModeCeiling:
     default: return "Bad";

SPIRV/spirv.h

@@ -1,24 +1,27 @@
 /*
-** Copyright (c) 2014-2015 The Khronos Group Inc.
+** Copyright (c) 2015 The Khronos Group Inc.
 **
-** Permission is hereby granted, free of charge, to any person obtaining a
+** Permission is hereby granted, free of charge, to any person obtaining a copy
-** copy of this software and/or associated documentation files (the
+** of this software and/or associated documentation files (the "Materials"),
-** "Materials"), to deal in the Materials without restriction, including
+** to deal in the Materials without restriction, including without limitation
-** without limitation the rights to use, copy, modify, merge, publish,
+** the rights to use, copy, modify, merge, publish, distribute, sublicense,
-** distribute, sublicense, and/or sell copies of the Materials, and to
+** and/or sell copies of the Materials, and to permit persons to whom the
-** permit persons to whom the Materials are furnished to do so, subject to
+** Materials are furnished to do so, subject to the following conditions:
-** the following conditions:
 **
-** The above copyright notice and this permission notice shall be included
+** The above copyright notice and this permission notice shall be included in
-** in all copies or substantial portions of the Materials.
+** all copies or substantial portions of the Materials.
 **
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ 
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+**
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+** THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM,OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS
+** IN THE MATERIALS.
 */
 
 /*
@@ -27,7 +30,7 @@
 */
 
 /*
-** Specification revision 29.
+** Specification revision 30.
 ** Enumeration tokens for SPIR-V, in three styles: C, C++, generic.
 ** - C++ will have the tokens in the "spv" name space, with no prefix.
 ** - C will have tokens with as "Spv" prefix.
@@ -143,15 +146,15 @@ enum Dim {
 
 enum SamplerAddressingMode {
     SamplerAddressingModeNone = 0,
-    SamplerAddressingModeClampToEdge = 2,
+    SamplerAddressingModeClampToEdge = 1,
-    SamplerAddressingModeClamp = 4,
+    SamplerAddressingModeClamp = 2,
-    SamplerAddressingModeRepeat = 6,
+    SamplerAddressingModeRepeat = 3,
-    SamplerAddressingModeRepeatMirrored = 8,
+    SamplerAddressingModeRepeatMirrored = 4,
 };
 
 enum SamplerFilterMode {
-    SamplerFilterModeNearest = 16,
+    SamplerFilterModeNearest = 0,
-    SamplerFilterModeLinear = 32,
+    SamplerFilterModeLinear = 1,
 };
 
 enum FPFastMathModeShift {
@@ -772,15 +775,15 @@ typedef enum SpvDim_ {
 
 typedef enum SpvSamplerAddressingMode_ {
     SpvSamplerAddressingModeNone = 0,
-    SpvSamplerAddressingModeClampToEdge = 2,
+    SpvSamplerAddressingModeClampToEdge = 1,
-    SpvSamplerAddressingModeClamp = 4,
+    SpvSamplerAddressingModeClamp = 2,
-    SpvSamplerAddressingModeRepeat = 6,
+    SpvSamplerAddressingModeRepeat = 3,
-    SpvSamplerAddressingModeRepeatMirrored = 8,
+    SpvSamplerAddressingModeRepeatMirrored = 4,
 } SpvSamplerAddressingMode;
 
 typedef enum SpvSamplerFilterMode_ {
-    SpvSamplerFilterModeNearest = 16,
+    SpvSamplerFilterModeNearest = 0,
-    SpvSamplerFilterModeLinear = 32,
+    SpvSamplerFilterModeLinear = 1,
 } SpvSamplerFilterMode;
 
 typedef enum SpvFPFastMathModeShift_ {