commit 97e52d81ac412abcf1fb7c2b694640fb7e426f96
author Cody Northrop <cody@lunarg.com> Mon Apr 20 14:09:40 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Apr 29 12:04:41 2015 -0600
tree 6feac9399f657cc66d1ff94c71837cbfbaebdce2
parent 6636d1a7928d7d772073e310dc7bafec7e6898bf

toolchain: Update to newer glslang and LunarGLASS versions

LUNARGLASS_REVISION=1070
GLSLANG_REVISION=30939

layers/shader_checker.cpp

diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index b5d8966..bd9a62e 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -230,17 +230,17 @@
 storage_class_name(unsigned sc)
 {
     switch (sc) {
-    case spv::StorageInput: return "input";
-    case spv::StorageOutput: return "output";
-    case spv::StorageConstantUniform: return "const uniform";
-    case spv::StorageUniform: return "uniform";
-    case spv::StorageWorkgroupLocal: return "workgroup local";
-    case spv::StorageWorkgroupGlobal: return "workgroup global";
-    case spv::StoragePrivateGlobal: return "private global";
-    case spv::StorageFunction: return "function";
-    case spv::StorageGeneric: return "generic";
-    case spv::StoragePrivate: return "private";
-    case spv::StorageAtomicCounter: return "atomic counter";
+    case spv::StorageClassInput: return "input";
+    case spv::StorageClassOutput: return "output";
+    case spv::StorageClassUniformConstant: return "const uniform";
+    case spv::StorageClassUniform: return "uniform";
+    case spv::StorageClassWorkgroupLocal: return "workgroup local";
+    case spv::StorageClassWorkgroupGlobal: return "workgroup global";
+    case spv::StorageClassPrivateGlobal: return "private global";
+    case spv::StorageClassFunction: return "function";
+    case spv::StorageClassGeneric: return "generic";
+    case spv::StorageClassPrivate: return "private";
+    case spv::StorageClassAtomicCounter: return "atomic counter";
     default: return "unknown";
     }
 }
@@ -414,11 +414,11 @@
          * builtins. Complain about anything that fits neither model.
          */
         if (opcode == spv::OpDecorate) {
-            if (code[word+2] == spv::DecLocation) {
+            if (code[word+2] == spv::DecorationLocation) {
                 var_locations[code[word+1]] = code[word+3];
             }
 
-            if (code[word+2] == spv::DecBuiltIn) {
+            if (code[word+2] == spv::DecorationBuiltIn) {
                 var_builtins[code[word+1]] = code[word+3];
             }
         }
@@ -485,8 +485,8 @@
 
     char str[1024];
 
-    collect_interface_by_location(producer, spv::StorageOutput, outputs, builtin_outputs);
-    collect_interface_by_location(consumer, spv::StorageInput, inputs, builtin_inputs);
+    collect_interface_by_location(producer, spv::StorageClassOutput, outputs, builtin_outputs);
+    collect_interface_by_location(consumer, spv::StorageClassInput, inputs, builtin_inputs);
 
     auto a_it = outputs.begin();
     auto b_it = inputs.begin();
@@ -594,7 +594,7 @@
     std::map<uint32_t, interface_var> builtin_inputs;
     char str[1024];
 
-    collect_interface_by_location(vs, spv::StorageInput, inputs, builtin_inputs);
+    collect_interface_by_location(vs, spv::StorageClassInput, inputs, builtin_inputs);
 
     /* Build index by location */
     std::map<uint32_t, VkVertexInputAttributeDescription const *> attribs;
@@ -638,7 +638,7 @@
 
     /* TODO: dual source blend index (spv::DecIndex, zero if not provided) */
 
-    collect_interface_by_location(fs, spv::StorageOutput, outputs, builtin_outputs);
+    collect_interface_by_location(fs, spv::StorageClassOutput, outputs, builtin_outputs);
 
     /* Check for legacy gl_FragColor broadcast: In this case, we should have no user-defined outputs,
      * and all color attachment should be UNORM/SNORM/FLOAT.

update_external_sources.sh

diff --git a/update_external_sources.sh b/update_external_sources.sh
index 73ed8ee..efeafe4 100755
--- a/update_external_sources.sh
+++ b/update_external_sources.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Update source for glslang and LLVM
 
-LUNARGLASS_REVISION=1061
-GLSLANG_REVISION=30042
+LUNARGLASS_REVISION=1070
+GLSLANG_REVISION=30939
 
 BUILDDIR=$PWD
 BASEDIR=$BUILDDIR/..