Merge branch 'master' of github.com:google/glslang into loopgen

Change-Id: Ie8236430bb9e30a9be2e0c1573c42183c2f4d0d4
2016-01-11 16:26:18 -05:00
parent 832c65c33b e23c9849c2
commit dba2826328
279 changed files with 59955 additions and 57020 deletions
--- a/Test/baseResults/spv.loopsArtificial.frag.out
+++ b/Test/baseResults/spv.loopsArtificial.frag.out
@@ -12,7 +12,7 @@ Linked fragment stage:
                              Capability Shader
               1:             ExtInstImport  "GLSL.std.450"
                              MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 11
+                              EntryPoint Fragment 4  "main" 11 140
                              ExecutionMode 4 OriginLowerLeft
                              Source GLSL 130
                              Name 4  "main"