Update to Glslang generator version 7

greg-lunarg · Jun 11, 2018 · f7efa14 · f7efa14
1 parent be8e087
commit f7efa14
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/glslc/test/assembly.py b/glslc/test/assembly.py
@@ -21,7 +21,7 @@ def assembly_comments():
     return """
     ; SPIR-V
     ; Version: 1.0
-    ; Generator: Google Shaderc over Glslang; 6
+    ; Generator: Google Shaderc over Glslang; 7
     ; Bound: 6
     ; Schema: 0"""
 

diff --git a/glslc/test/expect.py b/glslc/test/expect.py
@@ -172,7 +172,7 @@ def check_endianness(binary):
             return False, 'Incorrect SPV binary: wrong version number'
         # Shaderc-over-Glslang (0x000d....) or
         # SPIRV-Tools (0x0007....) generator number
-        if read_word(preamble, 2, little_endian) != 0x000d0006 and \
+        if read_word(preamble, 2, little_endian) != 0x000d0007 and \
                 read_word(preamble, 2, little_endian) != 0x00070000:
             return False, ('Incorrect SPV binary: wrong generator magic '
                            'number')

diff --git a/glslc/test/option_dash_cap_O.py b/glslc/test/option_dash_cap_O.py
@@ -23,7 +23,7 @@
 ASSEMBLY_WITH_DEBUG = [
     '; SPIR-V\n',
     '; Version: 1.0\n',
-    '; Generator: Google Shaderc over Glslang; 6\n',
+    '; Generator: Google Shaderc over Glslang; 7\n',
     '; Bound: 6\n',
     '; Schema: 0\n',
     '               OpCapability Shader\n',
@@ -44,7 +44,7 @@
 ASSEMBLY_WITHOUT_DEBUG = [
     '; SPIR-V\n',
     '; Version: 1.0\n',
-    '; Generator: Google Shaderc over Glslang; 6\n',
+    '; Generator: Google Shaderc over Glslang; 7\n',
     '; Bound: 6\n',
     '; Schema: 0\n',
     '               OpCapability Shader\n',

diff --git a/libshaderc/src/common_shaders_for_test.h b/libshaderc/src/common_shaders_for_test.h
@@ -189,7 +189,7 @@ const char kVertexOnlyShaderWithInvalidPragma[] =
 const char* kMinimalShaderDisassemblySubstrings[] = {
     "; SPIR-V\n"
     "; Version: 1.0\n"
-    "; Generator: Google Shaderc over Glslang; 6\n"
+    "; Generator: Google Shaderc over Glslang; 7\n"
     "; Bound:",
 
     "               OpCapability Shader\n",
@@ -201,7 +201,7 @@ const char* kMinimalShaderDisassemblySubstrings[] = {
 const char kMinimalShaderAssembly[] = R"(
     ; SPIR-V
     ; Version: 1.0
-    ; Generator: Google Shaderc over Glslang; 6
+    ; Generator: Google Shaderc over Glslang; 7
     ; Bound: 6
     ; Schema: 0