Fix builtIn having invalid ShaderDebugInfo lines
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 90c3b22..9dbd527 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -6028,6 +6028,19 @@
                         }
                     }
                     debugInfo.debugTypeOverride = builder.getDebugType(typeId);
+                } else if (glslangMember.type->getQualifier().builtIn != glslang::EbvNone) {
+                    // TODO - The built-in currently are not provide the correct line/column and spirv-val will validate these when using shaderDebugInfo
+                    //
+                    // There is a larger issue because even defining the builtIn such as
+                    //
+                    //      out gl_PerVertex {
+                    //         vec4 gl_Position;
+                    //     };
+                    //
+                    // in the shader also doesn't produce the correct line/column
+                    // So for now, provide zero, as that is a valid value here
+                    debugInfo.line = 0;
+                    debugInfo.column = 0;
                 }
 
                 memberDebugInfo.push_back(debugInfo);
diff --git a/Test/baseResults/spv.debuginfo.continued.glsl.vert.out b/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
index 4deb876..39ee33c 100644
--- a/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
@@ -1,14 +1,14 @@
 spv.debuginfo.continued.glsl.vert
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 73
+// Id's are bound by 69
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
                1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Vertex 14  "main" 57
+                              EntryPoint Vertex 14  "main" 53
                2:             String  "spv.debuginfo.continued.glsl.vert"
                8:             String  "uint"
               16:             String  "main"
@@ -3796,19 +3796,19 @@
 "
               33:             String  "float"
               41:             String  "gl_Position"
-              44:             String  "gl_PointSize"
-              47:             String  "gl_ClipDistance"
-              50:             String  "gl_CullDistance"
-              53:             String  "gl_PerVertex"
-              59:             String  ""
-              62:             String  "int"
+              43:             String  "gl_PointSize"
+              45:             String  "gl_ClipDistance"
+              47:             String  "gl_CullDistance"
+              49:             String  "gl_PerVertex"
+              55:             String  ""
+              58:             String  "int"
                               Name 14  "main"
                               Name 39  "gl_PerVertex"
                               MemberName 39(gl_PerVertex) 0  "gl_Position"
                               MemberName 39(gl_PerVertex) 1  "gl_PointSize"
                               MemberName 39(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 39(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 57  ""
+                              Name 53  ""
                               Decorate 39(gl_PerVertex) Block
                               MemberDecorate 39(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 39(gl_PerVertex) 1 BuiltIn PointSize
@@ -3839,37 +3839,33 @@
               37:             TypeArray 32(float) 26
               38:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 34 26
 39(gl_PerVertex):             TypeStruct 35(fvec4) 32(float) 37 37
-              42:      7(int) Constant 24
-              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 41 36 18 26 42 12 12 13
-              45:      7(int) Constant 42
-              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 44 34 18 26 45 12 12 13
-              48:      7(int) Constant 61
-              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 47 38 18 26 48 12 12 13
-              51:      7(int) Constant 85
-              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 50 38 18 26 51 12 12 13
-              54:      7(int) Constant 3778
-              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 53 26 18 54 12 25 53 12 13 40 43 46 49
-              55:             TypePointer Output 39(gl_PerVertex)
-              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 52 13 12
-              57:     55(ptr) Variable Output
-              60:      7(int) Constant 8
-              58:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 59 52 18 54 12 25 59 57 60
-              61:             TypeInt 32 1
-              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 62 10 27 12
-              64:     61(int) Constant 0
-              65:   32(float) Constant 1065353216
-              66:   35(fvec4) ConstantComposite 65 65 65 65
-              67:             TypePointer Output 35(fvec4)
-              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 36 13 12
-              72:      7(int) Constant 3779
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 41 36 18 12 12 12 12 13
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 43 34 18 12 12 12 12 13
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 45 38 18 12 12 12 12 13
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 47 38 18 12 12 12 12 13
+              50:      7(int) Constant 3778
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 49 26 18 50 12 25 49 12 13 40 42 44 46
+              51:             TypePointer Output 39(gl_PerVertex)
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 48 13 12
+              53:     51(ptr) Variable Output
+              56:      7(int) Constant 8
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 55 48 18 50 12 25 55 53 56
+              57:             TypeInt 32 1
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 58 10 27 12
+              60:     57(int) Constant 0
+              61:   32(float) Constant 1065353216
+              62:   35(fvec4) ConstantComposite 61 61 61 61
+              63:             TypePointer Output 35(fvec4)
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 36 13 12
+              68:      7(int) Constant 3779
         14(main):           4 Function None 5
               15:             Label
               30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
               31:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 24 24 12 12
               29:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 54 54 12 12
-              69:     67(ptr) AccessChain 57 64
-                              Store 69 66
-              71:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 72 72 12 12
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 50 50 12 12
+              65:     63(ptr) AccessChain 53 60
+                              Store 65 62
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 68 68 12 12
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.geom.out b/Test/baseResults/spv.debuginfo.glsl.geom.out
index 22526cf..56eb5d9 100644
--- a/Test/baseResults/spv.debuginfo.glsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.glsl.geom.out
@@ -1,7 +1,7 @@
 spv.debuginfo.glsl.geom
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 287
+// Id's are bound by 280
 
                               Capability Geometry
                               Capability MultiViewport
@@ -9,7 +9,7 @@
                1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Geometry 14  "main" 65 69 75 79 83 87 124 184 247 261 267 271
+                              EntryPoint Geometry 14  "main" 65 69 75 79 83 87 124 180 240 254 260 264
                               ExecutionMode 14 Triangles
                               ExecutionMode 14 Invocations 2
                               ExecutionMode 14 OutputTriangleStrip
@@ -105,17 +105,17 @@
              126:             String  "gl_InvocationID"
              159:             String  "pos"
              167:             String  "gl_Position"
-             170:             String  "gl_PointSize"
-             173:             String  "gl_ClipDistance"
-             176:             String  "gl_CullDistance"
-             179:             String  "gl_PerVertex"
-             186:             String  "gl_in"
-             194:             String  "worldPos"
-             207:             String  "lPos"
-             249:             String  ""
-             263:             String  "gl_ViewportIndex"
-             269:             String  "gl_PrimitiveID"
-             273:             String  "gl_PrimitiveIDIn"
+             169:             String  "gl_PointSize"
+             171:             String  "gl_ClipDistance"
+             173:             String  "gl_CullDistance"
+             175:             String  "gl_PerVertex"
+             182:             String  "gl_in"
+             190:             String  "worldPos"
+             203:             String  "lPos"
+             242:             String  ""
+             256:             String  "gl_ViewportIndex"
+             262:             String  "gl_PrimitiveID"
+             266:             String  "gl_PrimitiveIDIn"
                               SourceExtension  "GL_ARB_viewport_array"
                               Name 14  "main"
                               Name 40  "UBO"
@@ -137,18 +137,18 @@
                               MemberName 165(gl_PerVertex) 1  "gl_PointSize"
                               MemberName 165(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 165(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 184  "gl_in"
-                              Name 192  "worldPos"
-                              Name 205  "lPos"
-                              Name 235  "gl_PerVertex"
-                              MemberName 235(gl_PerVertex) 0  "gl_Position"
-                              MemberName 235(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 235(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 235(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 247  ""
-                              Name 261  "gl_ViewportIndex"
-                              Name 267  "gl_PrimitiveID"
-                              Name 271  "gl_PrimitiveIDIn"
+                              Name 180  "gl_in"
+                              Name 188  "worldPos"
+                              Name 201  "lPos"
+                              Name 231  "gl_PerVertex"
+                              MemberName 231(gl_PerVertex) 0  "gl_Position"
+                              MemberName 231(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 231(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 231(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 240  ""
+                              Name 254  "gl_ViewportIndex"
+                              Name 260  "gl_PrimitiveID"
+                              Name 264  "gl_PrimitiveIDIn"
                               Decorate 36 ArrayStride 64
                               Decorate 38 ArrayStride 64
                               Decorate 40(UBO) Block
@@ -173,14 +173,14 @@
                               MemberDecorate 165(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 165(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 165(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 235(gl_PerVertex) Block
-                              MemberDecorate 235(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 235(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 235(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 235(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 261(gl_ViewportIndex) BuiltIn ViewportIndex
-                              Decorate 267(gl_PrimitiveID) BuiltIn PrimitiveId
-                              Decorate 271(gl_PrimitiveIDIn) BuiltIn PrimitiveId
+                              Decorate 231(gl_PerVertex) Block
+                              MemberDecorate 231(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 231(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 231(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 231(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 254(gl_ViewportIndex) BuiltIn ViewportIndex
+                              Decorate 260(gl_PrimitiveID) BuiltIn PrimitiveId
+                              Decorate 264(gl_PrimitiveIDIn) BuiltIn PrimitiveId
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
@@ -280,69 +280,62 @@
              163:             TypeArray 25(float) 22
              164:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 27 22
 165(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 163 163
-             168:      7(int) Constant 23
-             166:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 29 18 24 168 12 12 13
-             171:      7(int) Constant 41
-             169:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 170 27 18 24 171 12 12 13
-             174:      7(int) Constant 60
-             172:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 24 174 12 12 13
-             177:      7(int) Constant 84
-             175:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 176 164 18 24 177 12 12 13
-             178:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 179 22 18 160 12 21 179 12 13 166 169 172 175
-             180:             TypeArray 165(gl_PerVertex) 13
-             181:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 178 13
-             182:             TypePointer Input 180
-             183:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 181 22 12
-      184(gl_in):    182(ptr) Variable Input
-             185:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 186 181 18 160 12 21 186 184(gl_in) 58
-             188:             TypePointer Input 28(fvec4)
-             189:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 22 12
-             195:      7(int) Constant 55
-             193:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 194 29 18 195 12 94 23
-             203:             TypePointer Function 59(fvec3)
-             204:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 60 44 12
-             208:      7(int) Constant 57
-             206:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 207 60 18 208 12 94 23
-             214:     96(int) Constant 2
-             215:             TypePointer Uniform 28(fvec4)
-             216:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 24 12
-             226:      7(int) Constant 58
-             232:      7(int) Constant 59
-235(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 163 163
-             237:      7(int) Constant 215
-             236:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 29 18 24 237 12 12 13
-             239:      7(int) Constant 233
-             238:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 170 27 18 24 239 12 12 13
-             241:      7(int) Constant 252
-             240:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 24 241 12 12 13
-             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 176 164 18 13 44 12 12 13
-             244:      7(int) Constant 61
-             243:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 179 22 18 244 12 21 179 12 13 236 238 240 242
-             245:             TypePointer Output 235(gl_PerVertex)
-             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 243 13 12
-             247:    245(ptr) Variable Output
-             248:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 249 243 18 244 12 21 249 247 58
-             256:             TypePointer Output 28(fvec4)
-             257:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 13 12
-             259:             TypePointer Output 96(int)
-             260:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 13 12
-261(gl_ViewportIndex):    259(ptr) Variable Output
-             264:      7(int) Constant 64
-             262:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 263 98 18 264 12 21 263 261(gl_ViewportIndex) 58
-267(gl_PrimitiveID):    259(ptr) Variable Output
-             270:      7(int) Constant 65
-             268:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 269 98 18 270 12 21 269 267(gl_PrimitiveID) 58
-271(gl_PrimitiveIDIn):    122(ptr) Variable Input
-             272:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 273 98 18 270 12 21 273 271(gl_PrimitiveIDIn) 58
-             277:      7(int) Constant 66
-             284:      7(int) Constant 68
-             286:      7(int) Constant 69
+             166:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 29 18 12 12 12 12 13
+             168:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 169 27 18 12 12 12 12 13
+             170:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 171 164 18 12 12 12 12 13
+             172:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 12 12 12 12 13
+             174:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 22 18 160 12 21 175 12 13 166 168 170 172
+             176:             TypeArray 165(gl_PerVertex) 13
+             177:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 174 13
+             178:             TypePointer Input 176
+             179:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 177 22 12
+      180(gl_in):    178(ptr) Variable Input
+             181:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 182 177 18 160 12 21 182 180(gl_in) 58
+             184:             TypePointer Input 28(fvec4)
+             185:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 22 12
+             191:      7(int) Constant 55
+             189:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 190 29 18 191 12 94 23
+             199:             TypePointer Function 59(fvec3)
+             200:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 60 44 12
+             204:      7(int) Constant 57
+             202:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 203 60 18 204 12 94 23
+             210:     96(int) Constant 2
+             211:             TypePointer Uniform 28(fvec4)
+             212:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 24 12
+             222:      7(int) Constant 58
+             228:      7(int) Constant 59
+231(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 163 163
+             232:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 29 18 12 12 12 12 13
+             233:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 169 27 18 12 12 12 12 13
+             234:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 171 164 18 12 12 12 12 13
+             235:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 12 12 12 12 13
+             237:      7(int) Constant 61
+             236:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 22 18 237 12 21 175 12 13 232 233 234 235
+             238:             TypePointer Output 231(gl_PerVertex)
+             239:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 236 13 12
+             240:    238(ptr) Variable Output
+             241:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 242 236 18 237 12 21 242 240 58
+             249:             TypePointer Output 28(fvec4)
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 13 12
+             252:             TypePointer Output 96(int)
+             253:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 13 12
+254(gl_ViewportIndex):    252(ptr) Variable Output
+             257:      7(int) Constant 64
+             255:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 256 98 18 257 12 21 256 254(gl_ViewportIndex) 58
+260(gl_PrimitiveID):    252(ptr) Variable Output
+             263:      7(int) Constant 65
+             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 262 98 18 263 12 21 262 260(gl_PrimitiveID) 58
+264(gl_PrimitiveIDIn):    122(ptr) Variable Input
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 266 98 18 263 12 21 266 264(gl_PrimitiveIDIn) 58
+             270:      7(int) Constant 66
+             277:      7(int) Constant 68
+             279:      7(int) Constant 69
         14(main):           4 Function None 5
               15:             Label
           101(i):     99(ptr) Variable Function
         157(pos):    155(ptr) Variable Function
-   192(worldPos):    155(ptr) Variable Function
-       205(lPos):    203(ptr) Variable Function
+   188(worldPos):    155(ptr) Variable Function
+       201(lPos):    199(ptr) Variable Function
               92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
               93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
               91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
@@ -387,70 +380,70 @@
                                 Store 79(outColor) 154
              162:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 160 160 12 12
              161:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 158 157(pos) 105
-             187:     96(int)   Load 101(i)
-             190:    188(ptr)   AccessChain 184(gl_in) 187 108
-             191:   28(fvec4)   Load 190
-                                Store 157(pos) 191
-             197:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 195 195 12 12
-             196:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 193 192(worldPos) 105
-             198:     96(int)   Load 124(gl_InvocationID)
-             199:    131(ptr)   AccessChain 55(ubo) 121 198
-             200:          30   Load 199
-             201:   28(fvec4)   Load 157(pos)
-             202:   28(fvec4)   MatrixTimesVector 200 201
-                                Store 192(worldPos) 202
-             210:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 208 208 12 12
-             209:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 206 205(lPos) 105
-             211:     96(int)   Load 124(gl_InvocationID)
-             212:    131(ptr)   AccessChain 55(ubo) 121 211
-             213:          30   Load 212
-             217:    215(ptr)   AccessChain 55(ubo) 214
-             218:   28(fvec4)   Load 217
-             219:   28(fvec4)   MatrixTimesVector 213 218
-             220:   25(float)   CompositeExtract 219 0
-             221:   25(float)   CompositeExtract 219 1
-             222:   25(float)   CompositeExtract 219 2
-             223:   59(fvec3)   CompositeConstruct 220 221 222
-                                Store 205(lPos) 223
-             225:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 226 226 12 12
-             224:   59(fvec3)   Load 205(lPos)
-             227:   28(fvec4)   Load 192(worldPos)
-             228:   59(fvec3)   VectorShuffle 227 227 0 1 2
-             229:   59(fvec3)   FSub 224 228
-                                Store 87(outLightVec) 229
-             231:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 232 232 12 12
-             230:   28(fvec4)   Load 192(worldPos)
-             233:   59(fvec3)   VectorShuffle 230 230 0 1 2
-             234:   59(fvec3)   FNegate 233
-                                Store 83(outViewVec) 234
-             251:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 244 244 12 12
-             250:     96(int)   Load 124(gl_InvocationID)
-             252:    131(ptr)   AccessChain 55(ubo) 108 250
-             253:          30   Load 252
-             254:   28(fvec4)   Load 192(worldPos)
-             255:   28(fvec4)   MatrixTimesVector 253 254
-             258:    256(ptr)   AccessChain 247 108
-                                Store 258 255
-             266:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 264 264 12 12
-             265:     96(int)   Load 124(gl_InvocationID)
-                                Store 261(gl_ViewportIndex) 265
-             275:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 270 270 12 12
-             274:     96(int)   Load 271(gl_PrimitiveIDIn)
-                                Store 267(gl_PrimitiveID) 274
-             276:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 277 277 12 12
+             183:     96(int)   Load 101(i)
+             186:    184(ptr)   AccessChain 180(gl_in) 183 108
+             187:   28(fvec4)   Load 186
+                                Store 157(pos) 187
+             193:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 191 191 12 12
+             192:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 189 188(worldPos) 105
+             194:     96(int)   Load 124(gl_InvocationID)
+             195:    131(ptr)   AccessChain 55(ubo) 121 194
+             196:          30   Load 195
+             197:   28(fvec4)   Load 157(pos)
+             198:   28(fvec4)   MatrixTimesVector 196 197
+                                Store 188(worldPos) 198
+             206:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 204 204 12 12
+             205:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 202 201(lPos) 105
+             207:     96(int)   Load 124(gl_InvocationID)
+             208:    131(ptr)   AccessChain 55(ubo) 121 207
+             209:          30   Load 208
+             213:    211(ptr)   AccessChain 55(ubo) 210
+             214:   28(fvec4)   Load 213
+             215:   28(fvec4)   MatrixTimesVector 209 214
+             216:   25(float)   CompositeExtract 215 0
+             217:   25(float)   CompositeExtract 215 1
+             218:   25(float)   CompositeExtract 215 2
+             219:   59(fvec3)   CompositeConstruct 216 217 218
+                                Store 201(lPos) 219
+             221:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 222 222 12 12
+             220:   59(fvec3)   Load 201(lPos)
+             223:   28(fvec4)   Load 188(worldPos)
+             224:   59(fvec3)   VectorShuffle 223 223 0 1 2
+             225:   59(fvec3)   FSub 220 224
+                                Store 87(outLightVec) 225
+             227:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 228 228 12 12
+             226:   28(fvec4)   Load 188(worldPos)
+             229:   59(fvec3)   VectorShuffle 226 226 0 1 2
+             230:   59(fvec3)   FNegate 229
+                                Store 83(outViewVec) 230
+             244:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 237 237 12 12
+             243:     96(int)   Load 124(gl_InvocationID)
+             245:    131(ptr)   AccessChain 55(ubo) 108 243
+             246:          30   Load 245
+             247:   28(fvec4)   Load 188(worldPos)
+             248:   28(fvec4)   MatrixTimesVector 246 247
+             251:    249(ptr)   AccessChain 240 108
+                                Store 251 248
+             259:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 257 257 12 12
+             258:     96(int)   Load 124(gl_InvocationID)
+                                Store 254(gl_ViewportIndex) 258
+             268:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 263 263 12 12
+             267:     96(int)   Load 264(gl_PrimitiveIDIn)
+                                Store 260(gl_PrimitiveID) 267
+             269:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 270 270 12 12
                                 EmitVertex
                                 Branch 112
              112:               Label
-             279:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
-             280:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 95 95 12 12
-             278:     96(int)   Load 101(i)
-             281:     96(int)   IAdd 278 121
-                                Store 101(i) 281
+             272:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             273:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 95 95 12 12
+             271:     96(int)   Load 101(i)
+             274:     96(int)   IAdd 271 121
+                                Store 101(i) 274
                                 Branch 109
              111:             Label
-             282:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-             283:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 284 284 12 12
+             275:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+             276:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 277 277 12 12
                               EndPrimitive
-             285:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 286 286 12 12
+             278:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 279 279 12 12
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.tesc.out b/Test/baseResults/spv.debuginfo.glsl.tesc.out
index 7014b1e..0a37c8a 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tesc.out
@@ -1,14 +1,14 @@
 spv.debuginfo.glsl.tesc
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 600
+// Id's are bound by 593
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
                1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 14  "main" 122 130 138 146 323 328 431 446 566
+                              EntryPoint TessellationControl 14  "main" 122 130 138 146 319 324 427 442 559
                               ExecutionMode 14 OutputVertices 4
                2:             String  "spv.debuginfo.glsl.tesc"
                8:             String  "uint"
@@ -187,16 +187,16 @@
              212:             String  "clip1"
              298:             String  "pos"
              306:             String  "gl_Position"
-             309:             String  "gl_PointSize"
-             312:             String  "gl_ClipDistance"
-             315:             String  "gl_CullDistance"
-             318:             String  "gl_PerVertex"
-             325:             String  "gl_in"
-             330:             String  "gl_InvocationID"
-             359:             String  "i"
-             433:             String  "gl_TessLevelInner"
-             448:             String  "gl_TessLevelOuter"
-             568:             String  "gl_out"
+             308:             String  "gl_PointSize"
+             310:             String  "gl_ClipDistance"
+             312:             String  "gl_CullDistance"
+             314:             String  "gl_PerVertex"
+             321:             String  "gl_in"
+             326:             String  "gl_InvocationID"
+             355:             String  "i"
+             429:             String  "gl_TessLevelInner"
+             444:             String  "gl_TessLevelOuter"
+             561:             String  "gl_out"
                               Name 14  "main"
                               Name 29  "screenSpaceTessFactor(vf4;vf4;"
                               Name 27  "p0"
@@ -228,25 +228,25 @@
                               MemberName 304(gl_PerVertex) 1  "gl_PointSize"
                               MemberName 304(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 304(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 323  "gl_in"
-                              Name 328  "gl_InvocationID"
-                              Name 357  "i"
-                              Name 431  "gl_TessLevelInner"
-                              Name 446  "gl_TessLevelOuter"
-                              Name 475  "param"
-                              Name 480  "param"
-                              Name 485  "param"
-                              Name 490  "param"
-                              Name 495  "param"
-                              Name 500  "param"
-                              Name 505  "param"
-                              Name 510  "param"
-                              Name 552  "gl_PerVertex"
-                              MemberName 552(gl_PerVertex) 0  "gl_Position"
-                              MemberName 552(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 552(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 552(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 566  "gl_out"
+                              Name 319  "gl_in"
+                              Name 324  "gl_InvocationID"
+                              Name 353  "i"
+                              Name 427  "gl_TessLevelInner"
+                              Name 442  "gl_TessLevelOuter"
+                              Name 471  "param"
+                              Name 476  "param"
+                              Name 481  "param"
+                              Name 486  "param"
+                              Name 491  "param"
+                              Name 496  "param"
+                              Name 501  "param"
+                              Name 506  "param"
+                              Name 548  "gl_PerVertex"
+                              MemberName 548(gl_PerVertex) 0  "gl_Position"
+                              MemberName 548(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 548(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 548(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 559  "gl_out"
                               Decorate 64 ArrayStride 16
                               Decorate 68(UBO) Block
                               MemberDecorate 68(UBO) 0 ColMajor
@@ -274,16 +274,16 @@
                               MemberDecorate 304(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 304(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 304(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 328(gl_InvocationID) BuiltIn InvocationId
-                              Decorate 431(gl_TessLevelInner) BuiltIn TessLevelInner
-                              Decorate 431(gl_TessLevelInner) Patch
-                              Decorate 446(gl_TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 446(gl_TessLevelOuter) Patch
-                              Decorate 552(gl_PerVertex) Block
-                              MemberDecorate 552(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 552(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 552(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 552(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 324(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 427(gl_TessLevelInner) BuiltIn TessLevelInner
+                              Decorate 427(gl_TessLevelInner) Patch
+                              Decorate 442(gl_TessLevelOuter) BuiltIn TessLevelOuter
+                              Decorate 442(gl_TessLevelOuter) Patch
+                              Decorate 548(gl_PerVertex) Block
+                              MemberDecorate 548(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 548(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 548(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 548(gl_PerVertex) 3 BuiltIn CullDistance
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
@@ -435,277 +435,270 @@
              302:             TypeArray 16(float) 37
              303:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 37
 304(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 302 302
-             307:      7(int) Constant 1756
-             305:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 306 21 33 37 307 12 12 13
-             310:      7(int) Constant 1774
-             308:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 309 18 33 37 310 12 12 13
-             313:      7(int) Constant 1793
-             311:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 312 303 33 37 313 12 12 13
-             316:      7(int) Constant 1817
-             314:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 315 303 33 37 316 12 12 13
-             317:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 318 37 33 299 12 36 318 12 13 305 308 311 314
-             319:             TypeArray 304(gl_PerVertex) 10
-             320:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 317 10
-             321:             TypePointer Input 319
-             322:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 320 37 12
-      323(gl_in):    321(ptr) Variable Input
-             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 325 320 33 299 12 36 325 323(gl_in) 83
-             326:             TypePointer Input 181(int)
-             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 183 37 12
-328(gl_InvocationID):    326(ptr) Variable Input
-             329:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 330 183 33 299 12 36 330 328(gl_InvocationID) 83
-             332:             TypePointer Input 19(fvec4)
-             333:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 37 12
-             338:      7(int) Constant 86
-             339:             TypePointer Input 66(fvec2)
-             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 67 37 12
-             345:    181(int) Constant 4
-             354:      7(int) Constant 89
-             353:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 354 38 56
-             355:             TypePointer Function 181(int)
-             356:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 183 23 12
-             358:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 359 183 33 354 12 353 20
-             377:      7(int) Constant 90
-             378:    181(int) Constant 3
-             380:             TypePointer Uniform 19(fvec4)
-             381:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 38 12
-             390:      7(int) Constant 92
-             389:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 390 20 353
-             391:    48(bool) ConstantFalse
-             401:      7(int) Constant 95
-             406:      7(int) Constant 96
-             412:      7(int) Constant 100
-             417:      7(int) Constant 102
-             416:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 417 13 59
-             425:      7(int) Constant 104
-             426:      7(int) Constant 25
-             424:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 425 426 416
-             427:             TypeArray 16(float) 38
-             428:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 38
-             429:             TypePointer Output 427
-             430:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 428 13 12
-431(gl_TessLevelInner):    429(ptr) Variable Output
-             432:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 433 428 33 425 12 36 433 431(gl_TessLevelInner) 83
-             434:             TypePointer Output 16(float)
-             435:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
-             441:      7(int) Constant 105
-             442:             TypeArray 16(float) 20
-             443:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 20
-             444:             TypePointer Output 442
-             445:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 443 13 12
-446(gl_TessLevelOuter):    444(ptr) Variable Output
-             449:      7(int) Constant 106
-             447:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 448 443 33 449 12 36 448 446(gl_TessLevelOuter) 83
-             454:      7(int) Constant 107
-             455:    181(int) Constant 2
-             458:      7(int) Constant 108
-             461:      7(int) Constant 109
-             464:      7(int) Constant 113
-             463:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 464 20 416
-             473:      7(int) Constant 115
-             474:      7(int) Constant 26
-             472:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 473 474 463
-             488:      7(int) Constant 116
-             498:      7(int) Constant 117
-             508:      7(int) Constant 118
-             517:      7(int) Constant 119
-             525:      7(int) Constant 120
-             533:      7(int) Constant 126
-             532:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 533 474 463
-             539:      7(int) Constant 127
-             542:      7(int) Constant 128
-             545:      7(int) Constant 129
-             548:      7(int) Constant 130
-             551:      7(int) Constant 131
-552(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 302 302
-             554:      7(int) Constant 110
-             553:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 306 21 33 37 554 12 12 13
-             555:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 309 18 33 37 542 12 12 13
-             557:      7(int) Constant 147
-             556:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 312 303 33 37 557 12 12 13
-             559:      7(int) Constant 171
-             558:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 315 303 33 37 559 12 12 13
-             561:      7(int) Constant 137
-             560:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 318 37 33 561 12 36 318 12 13 553 555 556 558
-             562:             TypeArray 552(gl_PerVertex) 20
-             563:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 560 20
-             564:             TypePointer Output 562
-             565:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 563 13 12
-     566(gl_out):    564(ptr) Variable Output
-             567:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 568 563 33 561 12 36 568 566(gl_out) 83
-             575:             TypePointer Output 19(fvec4)
-             576:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
-             580:      7(int) Constant 138
-             582:             TypePointer Input 116(fvec3)
-             583:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 37 12
-             586:             TypePointer Output 116(fvec3)
-             587:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 13 12
-             591:      7(int) Constant 139
-             595:             TypePointer Output 66(fvec2)
-             596:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 67 13 12
-             599:      7(int) Constant 140
+             305:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 306 21 33 12 12 12 12 13
+             307:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 308 18 33 12 12 12 12 13
+             309:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 310 303 33 12 12 12 12 13
+             311:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 312 303 33 12 12 12 12 13
+             313:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 314 37 33 299 12 36 314 12 13 305 307 309 311
+             315:             TypeArray 304(gl_PerVertex) 10
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 313 10
+             317:             TypePointer Input 315
+             318:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 316 37 12
+      319(gl_in):    317(ptr) Variable Input
+             320:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 321 316 33 299 12 36 321 319(gl_in) 83
+             322:             TypePointer Input 181(int)
+             323:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 183 37 12
+324(gl_InvocationID):    322(ptr) Variable Input
+             325:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 326 183 33 299 12 36 326 324(gl_InvocationID) 83
+             328:             TypePointer Input 19(fvec4)
+             329:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 37 12
+             334:      7(int) Constant 86
+             335:             TypePointer Input 66(fvec2)
+             336:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 67 37 12
+             341:    181(int) Constant 4
+             350:      7(int) Constant 89
+             349:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 350 38 56
+             351:             TypePointer Function 181(int)
+             352:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 183 23 12
+             354:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 355 183 33 350 12 349 20
+             373:      7(int) Constant 90
+             374:    181(int) Constant 3
+             376:             TypePointer Uniform 19(fvec4)
+             377:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 38 12
+             386:      7(int) Constant 92
+             385:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 386 20 349
+             387:    48(bool) ConstantFalse
+             397:      7(int) Constant 95
+             402:      7(int) Constant 96
+             408:      7(int) Constant 100
+             413:      7(int) Constant 102
+             412:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 413 13 59
+             421:      7(int) Constant 104
+             422:      7(int) Constant 25
+             420:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 421 422 412
+             423:             TypeArray 16(float) 38
+             424:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 38
+             425:             TypePointer Output 423
+             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 424 13 12
+427(gl_TessLevelInner):    425(ptr) Variable Output
+             428:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 429 424 33 421 12 36 429 427(gl_TessLevelInner) 83
+             430:             TypePointer Output 16(float)
+             431:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
+             437:      7(int) Constant 105
+             438:             TypeArray 16(float) 20
+             439:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 20
+             440:             TypePointer Output 438
+             441:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 439 13 12
+442(gl_TessLevelOuter):    440(ptr) Variable Output
+             445:      7(int) Constant 106
+             443:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 444 439 33 445 12 36 444 442(gl_TessLevelOuter) 83
+             450:      7(int) Constant 107
+             451:    181(int) Constant 2
+             454:      7(int) Constant 108
+             457:      7(int) Constant 109
+             460:      7(int) Constant 113
+             459:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 460 20 412
+             469:      7(int) Constant 115
+             470:      7(int) Constant 26
+             468:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 469 470 459
+             484:      7(int) Constant 116
+             494:      7(int) Constant 117
+             504:      7(int) Constant 118
+             513:      7(int) Constant 119
+             521:      7(int) Constant 120
+             529:      7(int) Constant 126
+             528:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 21(DebugLexicalBlock) 33 529 470 459
+             535:      7(int) Constant 127
+             538:      7(int) Constant 128
+             541:      7(int) Constant 129
+             544:      7(int) Constant 130
+             547:      7(int) Constant 131
+548(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 302 302
+             549:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 306 21 33 12 12 12 12 13
+             550:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 308 18 33 12 12 12 12 13
+             551:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 310 303 33 12 12 12 12 13
+             552:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 312 303 33 12 12 12 12 13
+             554:      7(int) Constant 137
+             553:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 314 37 33 554 12 36 314 12 13 549 550 551 552
+             555:             TypeArray 548(gl_PerVertex) 20
+             556:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 553 20
+             557:             TypePointer Output 555
+             558:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 556 13 12
+     559(gl_out):    557(ptr) Variable Output
+             560:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 561 556 33 554 12 36 561 559(gl_out) 83
+             568:             TypePointer Output 19(fvec4)
+             569:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
+             573:      7(int) Constant 138
+             575:             TypePointer Input 116(fvec3)
+             576:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 37 12
+             579:             TypePointer Output 116(fvec3)
+             580:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 13 12
+             584:      7(int) Constant 139
+             588:             TypePointer Output 66(fvec2)
+             589:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 67 13 12
+             592:      7(int) Constant 140
         14(main):           4 Function None 5
               15:             Label
-      475(param):     22(ptr) Variable Function
-      480(param):     22(ptr) Variable Function
-      485(param):     22(ptr) Variable Function
-      490(param):     22(ptr) Variable Function
-      495(param):     22(ptr) Variable Function
-      500(param):     22(ptr) Variable Function
-      505(param):     22(ptr) Variable Function
-      510(param):     22(ptr) Variable Function
-             408:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             409:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 60 60 12 12
-             407:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 59 14(main)
-             411:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 412 412 12 12
-             410:    181(int) Load 328(gl_InvocationID)
-             413:    48(bool) IEqual 410 197
-                              SelectionMerge 415 None
-                              BranchConditional 413 414 415
-             414:               Label
-             419:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 416
-             420:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 417 417 12 12
-             418:    48(bool)   FunctionCall 53(frustumCheck()
-             421:    48(bool)   LogicalNot 418
-                                SelectionMerge 423 None
-                                BranchConditional 421 422 462
-             422:                 Label
-             437:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 424
-             438:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 425 425 12 12
-             436:    434(ptr)     AccessChain 431(gl_TessLevelInner) 197
-                                  Store 436 202
-             440:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 441 441 12 12
-             439:    434(ptr)     AccessChain 431(gl_TessLevelInner) 184
-                                  Store 439 202
-             451:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 449 449 12 12
-             450:    434(ptr)     AccessChain 446(gl_TessLevelOuter) 197
-                                  Store 450 202
+      471(param):     22(ptr) Variable Function
+      476(param):     22(ptr) Variable Function
+      481(param):     22(ptr) Variable Function
+      486(param):     22(ptr) Variable Function
+      491(param):     22(ptr) Variable Function
+      496(param):     22(ptr) Variable Function
+      501(param):     22(ptr) Variable Function
+      506(param):     22(ptr) Variable Function
+             404:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             405:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 60 60 12 12
+             403:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 59 14(main)
+             407:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 408 408 12 12
+             406:    181(int) Load 324(gl_InvocationID)
+             409:    48(bool) IEqual 406 197
+                              SelectionMerge 411 None
+                              BranchConditional 409 410 411
+             410:               Label
+             415:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 412
+             416:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 413 413 12 12
+             414:    48(bool)   FunctionCall 53(frustumCheck()
+             417:    48(bool)   LogicalNot 414
+                                SelectionMerge 419 None
+                                BranchConditional 417 418 458
+             418:                 Label
+             433:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 420
+             434:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 421 421 12 12
+             432:    430(ptr)     AccessChain 427(gl_TessLevelInner) 197
+                                  Store 432 202
+             436:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 437 437 12 12
+             435:    430(ptr)     AccessChain 427(gl_TessLevelInner) 184
+                                  Store 435 202
+             447:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 445 445 12 12
+             446:    430(ptr)     AccessChain 442(gl_TessLevelOuter) 197
+                                  Store 446 202
+             449:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 450 450 12 12
+             448:    430(ptr)     AccessChain 442(gl_TessLevelOuter) 184
+                                  Store 448 202
              453:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 454 454 12 12
-             452:    434(ptr)     AccessChain 446(gl_TessLevelOuter) 184
+             452:    430(ptr)     AccessChain 442(gl_TessLevelOuter) 451
                                   Store 452 202
-             457:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 458 458 12 12
-             456:    434(ptr)     AccessChain 446(gl_TessLevelOuter) 455
-                                  Store 456 202
-             460:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 461 461 12 12
-             459:    434(ptr)     AccessChain 446(gl_TessLevelOuter) 378
-                                  Store 459 202
-                                  Branch 423
-             462:                 Label
-             466:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 463
-             467:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 464 464 12 12
-             465:    271(ptr)     AccessChain 98(ubo) 276
-             468:   16(float)     Load 465
-             469:    48(bool)     FOrdGreaterThan 468 202
-                                  SelectionMerge 471 None
-                                  BranchConditional 469 470 531
-             470:                   Label
-             477:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 472
-             478:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 473 473 12 12
-             476:    332(ptr)       AccessChain 323(gl_in) 378 197
-             479:   19(fvec4)       Load 476
-                                    Store 475(param) 479
-             481:    332(ptr)       AccessChain 323(gl_in) 197 197
-             482:   19(fvec4)       Load 481
-                                    Store 480(param) 482
-             483:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 475(param) 480(param)
-             484:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 197
-                                    Store 484 483
-             487:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 488 488 12 12
-             486:    332(ptr)       AccessChain 323(gl_in) 197 197
-             489:   19(fvec4)       Load 486
-                                    Store 485(param) 489
-             491:    332(ptr)       AccessChain 323(gl_in) 184 197
-             492:   19(fvec4)       Load 491
-                                    Store 490(param) 492
-             493:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 485(param) 490(param)
-             494:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 184
-                                    Store 494 493
-             497:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 498 498 12 12
-             496:    332(ptr)       AccessChain 323(gl_in) 184 197
-             499:   19(fvec4)       Load 496
-                                    Store 495(param) 499
-             501:    332(ptr)       AccessChain 323(gl_in) 455 197
-             502:   19(fvec4)       Load 501
-                                    Store 500(param) 502
-             503:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 495(param) 500(param)
-             504:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 455
-                                    Store 504 503
-             507:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 508 508 12 12
-             506:    332(ptr)       AccessChain 323(gl_in) 455 197
-             509:   19(fvec4)       Load 506
-                                    Store 505(param) 509
-             511:    332(ptr)       AccessChain 323(gl_in) 378 197
-             512:   19(fvec4)       Load 511
-                                    Store 510(param) 512
-             513:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 505(param) 510(param)
-             514:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 378
-                                    Store 514 513
-             516:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 517 517 12 12
-             515:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 197
-             518:   16(float)       Load 515
-             519:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 378
-             520:   16(float)       Load 519
-             521:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 518 520 157
-             522:    434(ptr)       AccessChain 431(gl_TessLevelInner) 197
-                                    Store 522 521
-             524:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 525 525 12 12
-             523:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 455
-             526:   16(float)       Load 523
-             527:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 184
-             528:   16(float)       Load 527
-             529:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 526 528 157
-             530:    434(ptr)       AccessChain 431(gl_TessLevelInner) 184
-                                    Store 530 529
-                                    Branch 471
-             531:                   Label
-             535:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 532
-             536:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 533 533 12 12
-             534:    434(ptr)       AccessChain 431(gl_TessLevelInner) 197
-                                    Store 534 280
-             538:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 539 539 12 12
-             537:    434(ptr)       AccessChain 431(gl_TessLevelInner) 184
-                                    Store 537 280
-             541:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 542 542 12 12
-             540:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 197
-                                    Store 540 280
-             544:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 545 545 12 12
-             543:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 184
-                                    Store 543 280
-             547:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 548 548 12 12
-             546:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 455
-                                    Store 546 280
-             550:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 551 551 12 12
-             549:    434(ptr)       AccessChain 446(gl_TessLevelOuter) 378
-                                    Store 549 280
-                                    Branch 471
-             471:                 Label
-                                  Branch 423
-             423:               Label
-                                Branch 415
-             415:             Label
-             570:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             571:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 561 561 12 12
-             569:    181(int) Load 328(gl_InvocationID)
-             572:    181(int) Load 328(gl_InvocationID)
-             573:    332(ptr) AccessChain 323(gl_in) 572 197
-             574:   19(fvec4) Load 573
-             577:    575(ptr) AccessChain 566(gl_out) 569 197
-                              Store 577 574
-             579:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 580 580 12 12
-             578:    181(int) Load 328(gl_InvocationID)
-             581:    181(int) Load 328(gl_InvocationID)
-             584:    582(ptr) AccessChain 122(inNormal) 581
-             585:  116(fvec3) Load 584
-             588:    586(ptr) AccessChain 138(outNormal) 578
-                              Store 588 585
-             590:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 591 591 12 12
-             589:    181(int) Load 328(gl_InvocationID)
-             592:    181(int) Load 328(gl_InvocationID)
-             593:    339(ptr) AccessChain 130(inUV) 592
-             594:   66(fvec2) Load 593
-             597:    595(ptr) AccessChain 146(outUV) 589
-                              Store 597 594
-             598:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 599 599 12 12
+             456:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 457 457 12 12
+             455:    430(ptr)     AccessChain 442(gl_TessLevelOuter) 374
+                                  Store 455 202
+                                  Branch 419
+             458:                 Label
+             462:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 459
+             463:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 460 460 12 12
+             461:    271(ptr)     AccessChain 98(ubo) 276
+             464:   16(float)     Load 461
+             465:    48(bool)     FOrdGreaterThan 464 202
+                                  SelectionMerge 467 None
+                                  BranchConditional 465 466 527
+             466:                   Label
+             473:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 468
+             474:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 469 469 12 12
+             472:    328(ptr)       AccessChain 319(gl_in) 374 197
+             475:   19(fvec4)       Load 472
+                                    Store 471(param) 475
+             477:    328(ptr)       AccessChain 319(gl_in) 197 197
+             478:   19(fvec4)       Load 477
+                                    Store 476(param) 478
+             479:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 471(param) 476(param)
+             480:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 197
+                                    Store 480 479
+             483:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 484 484 12 12
+             482:    328(ptr)       AccessChain 319(gl_in) 197 197
+             485:   19(fvec4)       Load 482
+                                    Store 481(param) 485
+             487:    328(ptr)       AccessChain 319(gl_in) 184 197
+             488:   19(fvec4)       Load 487
+                                    Store 486(param) 488
+             489:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 481(param) 486(param)
+             490:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 184
+                                    Store 490 489
+             493:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 494 494 12 12
+             492:    328(ptr)       AccessChain 319(gl_in) 184 197
+             495:   19(fvec4)       Load 492
+                                    Store 491(param) 495
+             497:    328(ptr)       AccessChain 319(gl_in) 451 197
+             498:   19(fvec4)       Load 497
+                                    Store 496(param) 498
+             499:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 491(param) 496(param)
+             500:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 451
+                                    Store 500 499
+             503:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 504 504 12 12
+             502:    328(ptr)       AccessChain 319(gl_in) 451 197
+             505:   19(fvec4)       Load 502
+                                    Store 501(param) 505
+             507:    328(ptr)       AccessChain 319(gl_in) 374 197
+             508:   19(fvec4)       Load 507
+                                    Store 506(param) 508
+             509:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 501(param) 506(param)
+             510:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 374
+                                    Store 510 509
+             512:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 513 513 12 12
+             511:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 197
+             514:   16(float)       Load 511
+             515:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 374
+             516:   16(float)       Load 515
+             517:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 514 516 157
+             518:    430(ptr)       AccessChain 427(gl_TessLevelInner) 197
+                                    Store 518 517
+             520:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 521 521 12 12
+             519:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 451
+             522:   16(float)       Load 519
+             523:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 184
+             524:   16(float)       Load 523
+             525:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 522 524 157
+             526:    430(ptr)       AccessChain 427(gl_TessLevelInner) 184
+                                    Store 526 525
+                                    Branch 467
+             527:                   Label
+             531:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 528
+             532:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 529 529 12 12
+             530:    430(ptr)       AccessChain 427(gl_TessLevelInner) 197
+                                    Store 530 280
+             534:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 535 535 12 12
+             533:    430(ptr)       AccessChain 427(gl_TessLevelInner) 184
+                                    Store 533 280
+             537:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 538 538 12 12
+             536:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 197
+                                    Store 536 280
+             540:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 541 541 12 12
+             539:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 184
+                                    Store 539 280
+             543:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 544 544 12 12
+             542:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 451
+                                    Store 542 280
+             546:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 547 547 12 12
+             545:    430(ptr)       AccessChain 442(gl_TessLevelOuter) 374
+                                    Store 545 280
+                                    Branch 467
+             467:                 Label
+                                  Branch 419
+             419:               Label
+                                Branch 411
+             411:             Label
+             563:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             564:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 554 554 12 12
+             562:    181(int) Load 324(gl_InvocationID)
+             565:    181(int) Load 324(gl_InvocationID)
+             566:    328(ptr) AccessChain 319(gl_in) 565 197
+             567:   19(fvec4) Load 566
+             570:    568(ptr) AccessChain 559(gl_out) 562 197
+                              Store 570 567
+             572:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 573 573 12 12
+             571:    181(int) Load 324(gl_InvocationID)
+             574:    181(int) Load 324(gl_InvocationID)
+             577:    575(ptr) AccessChain 122(inNormal) 574
+             578:  116(fvec3) Load 577
+             581:    579(ptr) AccessChain 138(outNormal) 571
+                              Store 581 578
+             583:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 584 584 12 12
+             582:    181(int) Load 324(gl_InvocationID)
+             585:    181(int) Load 324(gl_InvocationID)
+             586:    335(ptr) AccessChain 130(inUV) 585
+             587:   66(fvec2) Load 586
+             590:    588(ptr) AccessChain 146(outUV) 582
+                              Store 590 587
+             591:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 592 592 12 12
                               Return
                               FunctionEnd
 29(screenSpaceTessFactor(vf4;vf4;):   16(float) Function None 25
@@ -823,7 +816,7 @@
 53(frustumCheck():    48(bool) Function None 51
               54:             Label
         296(pos):     22(ptr) Variable Function
-          357(i):    355(ptr) Variable Function
+          353(i):    351(ptr) Variable Function
              289:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
              290:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 57 57 12 12
              288:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 56 53(frustumCheck()
@@ -831,67 +824,67 @@
              294:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 292 291 42
              301:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 299 299 12 12
              300:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 297 296(pos) 42
-             331:    181(int) Load 328(gl_InvocationID)
-             334:    332(ptr) AccessChain 323(gl_in) 331 197
-             335:   19(fvec4) Load 334
-                              Store 296(pos) 335
-             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 338 338 12 12
-             336:         107 Load 113(samplerHeight)
-             341:    339(ptr) AccessChain 130(inUV) 197
-             342:   66(fvec2) Load 341
-             343:   19(fvec4) ImageSampleExplicitLod 336 342 Lod 202
-             344:   16(float) CompositeExtract 343 0
-             346:    271(ptr) AccessChain 98(ubo) 345
-             347:   16(float) Load 346
-             348:   16(float) FMul 344 347
-             349:    162(ptr) AccessChain 296(pos) 37
-             350:   16(float) Load 349
-             351:   16(float) FSub 350 348
-             352:    162(ptr) AccessChain 296(pos) 37
-                              Store 352 351
-             361:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 353
-             362:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 354 354 12 12
-             360:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 358 357(i) 42
-                              Store 357(i) 197
-                              Branch 363
-             363:             Label
-             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 353
-             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 354 354 12 12
-                              LoopMerge 365 366 None
-                              Branch 369
-             369:             Label
-             371:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 353
-             372:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 354 354 12 12
-             370:    181(int) Load 357(i)
-             373:    48(bool) SLessThan 370 240
-                              BranchConditional 373 364 365
-             364:               Label
-             375:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 353
-             376:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 377 377 12 12
-             374:   19(fvec4)   Load 296(pos)
-             379:    181(int)   Load 357(i)
-             382:    380(ptr)   AccessChain 98(ubo) 378 379
-             383:   19(fvec4)   Load 382
-             384:   16(float)   Dot 374 383
-             385:   16(float)   FAdd 384 291
-             386:    48(bool)   FOrdLessThan 385 202
-                                SelectionMerge 388 None
-                                BranchConditional 386 387 388
-             387:                 Label
-             392:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 389
-             393:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 390 390 12 12
-                                  ReturnValue 391
-             388:               Label
-                                Branch 366
-             366:               Label
-             396:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 353
-             397:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 354 354 12 12
-             395:    181(int)   Load 357(i)
-             398:    181(int)   IAdd 395 184
-                                Store 357(i) 398
-                                Branch 363
+             327:    181(int) Load 324(gl_InvocationID)
+             330:    328(ptr) AccessChain 319(gl_in) 327 197
+             331:   19(fvec4) Load 330
+                              Store 296(pos) 331
+             333:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 334 334 12 12
+             332:         107 Load 113(samplerHeight)
+             337:    335(ptr) AccessChain 130(inUV) 197
+             338:   66(fvec2) Load 337
+             339:   19(fvec4) ImageSampleExplicitLod 332 338 Lod 202
+             340:   16(float) CompositeExtract 339 0
+             342:    271(ptr) AccessChain 98(ubo) 341
+             343:   16(float) Load 342
+             344:   16(float) FMul 340 343
+             345:    162(ptr) AccessChain 296(pos) 37
+             346:   16(float) Load 345
+             347:   16(float) FSub 346 344
+             348:    162(ptr) AccessChain 296(pos) 37
+                              Store 348 347
+             357:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 349
+             358:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 350 350 12 12
+             356:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 354 353(i) 42
+                              Store 353(i) 197
+                              Branch 359
+             359:             Label
+             363:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 349
+             364:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 350 350 12 12
+                              LoopMerge 361 362 None
+                              Branch 365
              365:             Label
-             399:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             400:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 401 401 12 12
+             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 349
+             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 350 350 12 12
+             366:    181(int) Load 353(i)
+             369:    48(bool) SLessThan 366 240
+                              BranchConditional 369 360 361
+             360:               Label
+             371:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 349
+             372:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 373 373 12 12
+             370:   19(fvec4)   Load 296(pos)
+             375:    181(int)   Load 353(i)
+             378:    376(ptr)   AccessChain 98(ubo) 374 375
+             379:   19(fvec4)   Load 378
+             380:   16(float)   Dot 370 379
+             381:   16(float)   FAdd 380 291
+             382:    48(bool)   FOrdLessThan 381 202
+                                SelectionMerge 384 None
+                                BranchConditional 382 383 384
+             383:                 Label
+             388:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 385
+             389:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 386 386 12 12
+                                  ReturnValue 387
+             384:               Label
+                                Branch 362
+             362:               Label
+             392:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 349
+             393:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 350 350 12 12
+             391:    181(int)   Load 353(i)
+             394:    181(int)   IAdd 391 184
+                                Store 353(i) 394
+                                Branch 359
+             361:             Label
+             395:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             396:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 397 397 12 12
                               ReturnValue 63
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.tese.out b/Test/baseResults/spv.debuginfo.glsl.tese.out
index 681d952..c5987c6 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tese.out
@@ -1,14 +1,14 @@
 spv.debuginfo.glsl.tese
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 378
+// Id's are bound by 370
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
                1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationEvaluation 14  "main" 95 103 109 115 119 123 127 131 160 260 331
+                              EntryPoint TessellationEvaluation 14  "main" 95 103 109 115 119 123 127 131 160 256 323
                               ExecutionMode 14 Quads
                               ExecutionMode 14 SpacingEqual
                               ExecutionMode 14 VertexOrderCw
@@ -127,14 +127,14 @@
              211:             String  "n2"
              235:             String  "pos1"
              243:             String  "gl_Position"
-             246:             String  "gl_PointSize"
-             249:             String  "gl_ClipDistance"
-             252:             String  "gl_CullDistance"
-             255:             String  "gl_PerVertex"
-             262:             String  "gl_in"
-             275:             String  "pos2"
-             289:             String  "pos"
-             333:             String  ""
+             245:             String  "gl_PointSize"
+             247:             String  "gl_ClipDistance"
+             249:             String  "gl_CullDistance"
+             251:             String  "gl_PerVertex"
+             258:             String  "gl_in"
+             271:             String  "pos2"
+             285:             String  "pos"
+             325:             String  ""
                               Name 14  "main"
                               Name 40  "UBO"
                               MemberName 40(UBO) 0  "projection"
@@ -166,15 +166,15 @@
                               MemberName 241(gl_PerVertex) 1  "gl_PointSize"
                               MemberName 241(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 241(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 260  "gl_in"
-                              Name 273  "pos2"
-                              Name 287  "pos"
-                              Name 318  "gl_PerVertex"
-                              MemberName 318(gl_PerVertex) 0  "gl_Position"
-                              MemberName 318(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 318(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 318(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 331  ""
+                              Name 256  "gl_in"
+                              Name 269  "pos2"
+                              Name 283  "pos"
+                              Name 314  "gl_PerVertex"
+                              MemberName 314(gl_PerVertex) 0  "gl_Position"
+                              MemberName 314(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 314(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 314(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 323  ""
                               Decorate 36 ArrayStride 16
                               Decorate 40(UBO) Block
                               MemberDecorate 40(UBO) 0 ColMajor
@@ -207,11 +207,11 @@
                               MemberDecorate 241(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 241(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 241(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 318(gl_PerVertex) Block
-                              MemberDecorate 318(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 318(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 318(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 318(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 314(gl_PerVertex) Block
+                              MemberDecorate 314(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 314(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 314(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 314(gl_PerVertex) 3 BuiltIn CullDistance
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
@@ -349,60 +349,52 @@
              239:             TypeArray 25(float) 22
              240:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 27 22
 241(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 239 239
-             244:      7(int) Constant 1756
-             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 243 29 18 22 244 12 12 13
-             247:      7(int) Constant 1774
-             245:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 246 27 18 22 247 12 12 13
-             250:      7(int) Constant 1793
-             248:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 249 240 18 22 250 12 12 13
-             253:      7(int) Constant 1817
-             251:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 252 240 18 22 253 12 12 13
-             254:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 255 22 18 236 12 21 255 12 13 242 245 248 251
-             256:             TypeArray 241(gl_PerVertex) 10
-             257:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 254 10
-             258:             TypePointer Input 256
-             259:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 257 22 12
-      260(gl_in):    258(ptr) Variable Input
-             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 262 257 18 236 12 21 262 260(gl_in) 56
-             263:             TypePointer Input 28(fvec4)
-             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 22 12
-             276:      7(int) Constant 66
-             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 275 29 18 276 12 17 23
-             290:      7(int) Constant 67
-             288:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 289 29 18 290 12 17 23
-             301:      7(int) Constant 69
-             303:   25(float) Constant 0
-             306:    147(int) Constant 4
-             307:             TypePointer Uniform 25(float)
-             308:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 27 24 12
-             312:             TypePointer Function 25(float)
-             313:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 27 44 12
-318(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 239 239
-             320:      7(int) Constant 165
-             319:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 243 29 18 22 320 12 12 13
-             322:      7(int) Constant 183
-             321:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 246 27 18 22 322 12 12 13
-             324:      7(int) Constant 202
-             323:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 249 240 18 22 324 12 12 13
-             326:      7(int) Constant 226
-             325:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 252 240 18 22 326 12 12 13
-             328:      7(int) Constant 71
-             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 255 22 18 328 12 21 255 12 13 319 321 323 325
-             329:             TypePointer Output 318(gl_PerVertex)
-             330:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 327 13 12
-             331:    329(ptr) Variable Output
-             332:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 333 327 18 328 12 21 333 331 56
-             334:             TypePointer Uniform 30
-             335:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 24 12
-             344:             TypePointer Output 28(fvec4)
-             345:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 13 12
-             349:      7(int) Constant 74
-             352:             TypePointer Uniform 28(fvec4)
-             353:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 24 12
-             356:      7(int) Constant 75
-             364:      7(int) Constant 76
-             368:      7(int) Constant 77
-             377:      7(int) Constant 78
+             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 243 29 18 12 12 12 12 13
+             244:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 245 27 18 12 12 12 12 13
+             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 247 240 18 12 12 12 12 13
+             248:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 249 240 18 12 12 12 12 13
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 251 22 18 236 12 21 251 12 13 242 244 246 248
+             252:             TypeArray 241(gl_PerVertex) 10
+             253:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 250 10
+             254:             TypePointer Input 252
+             255:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 253 22 12
+      256(gl_in):    254(ptr) Variable Input
+             257:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 258 253 18 236 12 21 258 256(gl_in) 56
+             259:             TypePointer Input 28(fvec4)
+             260:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 22 12
+             272:      7(int) Constant 66
+             270:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 271 29 18 272 12 17 23
+             286:      7(int) Constant 67
+             284:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 285 29 18 286 12 17 23
+             297:      7(int) Constant 69
+             299:   25(float) Constant 0
+             302:    147(int) Constant 4
+             303:             TypePointer Uniform 25(float)
+             304:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 27 24 12
+             308:             TypePointer Function 25(float)
+             309:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 27 44 12
+314(gl_PerVertex):             TypeStruct 28(fvec4) 25(float) 239 239
+             315:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 243 29 18 12 12 12 12 13
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 245 27 18 12 12 12 12 13
+             317:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 247 240 18 12 12 12 12 13
+             318:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 249 240 18 12 12 12 12 13
+             320:      7(int) Constant 71
+             319:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 251 22 18 320 12 21 251 12 13 315 316 317 318
+             321:             TypePointer Output 314(gl_PerVertex)
+             322:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 319 13 12
+             323:    321(ptr) Variable Output
+             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 325 319 18 320 12 21 325 323 56
+             326:             TypePointer Uniform 30
+             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 24 12
+             336:             TypePointer Output 28(fvec4)
+             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 13 12
+             341:      7(int) Constant 74
+             344:             TypePointer Uniform 28(fvec4)
+             345:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 24 12
+             348:      7(int) Constant 75
+             356:      7(int) Constant 76
+             360:      7(int) Constant 77
+             369:      7(int) Constant 78
         14(main):           4 Function None 5
               15:             Label
         140(uv1):    138(ptr) Variable Function
@@ -410,8 +402,8 @@
          195(n1):    193(ptr) Variable Function
          209(n2):    193(ptr) Variable Function
        233(pos1):    231(ptr) Variable Function
-       273(pos2):    231(ptr) Variable Function
-        287(pos):    231(ptr) Variable Function
+       269(pos2):    231(ptr) Variable Function
+        283(pos):    231(ptr) Variable Function
              136:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
              137:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
              135:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
@@ -477,85 +469,85 @@
                               Store 109(outNormal) 230
              238:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 236 236 12 12
              237:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 234 233(pos1) 145
-             265:    263(ptr) AccessChain 260(gl_in) 150 150
-             266:   28(fvec4) Load 265
-             267:    263(ptr) AccessChain 260(gl_in) 155 150
-             268:   28(fvec4) Load 267
-             269:    163(ptr) AccessChain 160(gl_TessCoord) 12
-             270:   25(float) Load 269
-             271:   28(fvec4) CompositeConstruct 270 270 270 270
-             272:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 266 268 271
-                              Store 233(pos1) 272
-             278:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 276 276 12 12
-             277:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 274 273(pos2) 145
-             279:    263(ptr) AccessChain 260(gl_in) 175 150
-             280:   28(fvec4) Load 279
-             281:    263(ptr) AccessChain 260(gl_in) 178 150
-             282:   28(fvec4) Load 281
-             283:    163(ptr) AccessChain 160(gl_TessCoord) 12
-             284:   25(float) Load 283
-             285:   28(fvec4) CompositeConstruct 284 284 284 284
-             286:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 280 282 285
-                              Store 273(pos2) 286
-             292:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 290 290 12 12
-             291:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 288 287(pos) 145
-             293:   28(fvec4) Load 233(pos1)
-             294:   28(fvec4) Load 273(pos2)
-             295:    163(ptr) AccessChain 160(gl_TessCoord) 22
-             296:   25(float) Load 295
-             297:   28(fvec4) CompositeConstruct 296 296 296 296
-             298:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 293 294 297
-                              Store 287(pos) 298
-             300:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 301 301 12 12
-             299:          80 Load 86(displacementMap)
-             302:   38(fvec2) Load 115(outUV)
-             304:   28(fvec4) ImageSampleExplicitLod 299 302 Lod 303
-             305:   25(float) CompositeExtract 304 0
-             309:    307(ptr) AccessChain 71(ubo) 306
-             310:   25(float) Load 309
-             311:   25(float) FMul 305 310
-             314:    312(ptr) AccessChain 287(pos) 22
-             315:   25(float) Load 314
-             316:   25(float) FSub 315 311
-             317:    312(ptr) AccessChain 287(pos) 22
-                              Store 317 316
-             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 328 328 12 12
-             336:    334(ptr) AccessChain 71(ubo) 150
-             338:          30 Load 336
-             339:    334(ptr) AccessChain 71(ubo) 155
-             340:          30 Load 339
-             341:          30 MatrixTimesMatrix 338 340
-             342:   28(fvec4) Load 287(pos)
-             343:   28(fvec4) MatrixTimesVector 341 342
-             346:    344(ptr) AccessChain 331 150
-                              Store 346 343
-             348:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 349 349 12 12
-             347:   28(fvec4) Load 287(pos)
-             350:   89(fvec3) VectorShuffle 347 347 0 1 2
-             351:   89(fvec3) FNegate 350
-                              Store 119(outViewVec) 351
+             261:    259(ptr) AccessChain 256(gl_in) 150 150
+             262:   28(fvec4) Load 261
+             263:    259(ptr) AccessChain 256(gl_in) 155 150
+             264:   28(fvec4) Load 263
+             265:    163(ptr) AccessChain 160(gl_TessCoord) 12
+             266:   25(float) Load 265
+             267:   28(fvec4) CompositeConstruct 266 266 266 266
+             268:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 262 264 267
+                              Store 233(pos1) 268
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 272 272 12 12
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 270 269(pos2) 145
+             275:    259(ptr) AccessChain 256(gl_in) 175 150
+             276:   28(fvec4) Load 275
+             277:    259(ptr) AccessChain 256(gl_in) 178 150
+             278:   28(fvec4) Load 277
+             279:    163(ptr) AccessChain 160(gl_TessCoord) 12
+             280:   25(float) Load 279
+             281:   28(fvec4) CompositeConstruct 280 280 280 280
+             282:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 276 278 281
+                              Store 269(pos2) 282
+             288:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 286 286 12 12
+             287:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 284 283(pos) 145
+             289:   28(fvec4) Load 233(pos1)
+             290:   28(fvec4) Load 269(pos2)
+             291:    163(ptr) AccessChain 160(gl_TessCoord) 22
+             292:   25(float) Load 291
+             293:   28(fvec4) CompositeConstruct 292 292 292 292
+             294:   28(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 289 290 293
+                              Store 283(pos) 294
+             296:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 297 297 12 12
+             295:          80 Load 86(displacementMap)
+             298:   38(fvec2) Load 115(outUV)
+             300:   28(fvec4) ImageSampleExplicitLod 295 298 Lod 299
+             301:   25(float) CompositeExtract 300 0
+             305:    303(ptr) AccessChain 71(ubo) 302
+             306:   25(float) Load 305
+             307:   25(float) FMul 301 306
+             310:    308(ptr) AccessChain 283(pos) 22
+             311:   25(float) Load 310
+             312:   25(float) FSub 311 307
+             313:    308(ptr) AccessChain 283(pos) 22
+                              Store 313 312
+             329:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 320 320 12 12
+             328:    326(ptr) AccessChain 71(ubo) 150
+             330:          30 Load 328
+             331:    326(ptr) AccessChain 71(ubo) 155
+             332:          30 Load 331
+             333:          30 MatrixTimesMatrix 330 332
+             334:   28(fvec4) Load 283(pos)
+             335:   28(fvec4) MatrixTimesVector 333 334
+             338:    336(ptr) AccessChain 323 150
+                              Store 338 335
+             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 341 341 12 12
+             339:   28(fvec4) Load 283(pos)
+             342:   89(fvec3) VectorShuffle 339 339 0 1 2
+             343:   89(fvec3) FNegate 342
+                              Store 119(outViewVec) 343
+             347:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 348 348 12 12
+             346:    344(ptr) AccessChain 71(ubo) 178
+             349:   28(fvec4) Load 346
+             350:   89(fvec3) VectorShuffle 349 349 0 1 2
+             351:   89(fvec3) Load 119(outViewVec)
+             352:   89(fvec3) FAdd 350 351
+             353:   89(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 352
+                              Store 123(outLightVec) 353
              355:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 356 356 12 12
-             354:    352(ptr) AccessChain 71(ubo) 178
-             357:   28(fvec4) Load 354
-             358:   89(fvec3) VectorShuffle 357 357 0 1 2
-             359:   89(fvec3) Load 119(outViewVec)
-             360:   89(fvec3) FAdd 358 359
-             361:   89(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 360
-                              Store 123(outLightVec) 361
-             363:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 364 364 12 12
-             362:   28(fvec4) Load 287(pos)
-             365:   89(fvec3) VectorShuffle 362 362 0 1 2
-                              Store 131(outWorldPos) 365
-             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 368 368 12 12
-             366:    334(ptr) AccessChain 71(ubo) 155
-             369:          30 Load 366
-             370:   28(fvec4) Load 287(pos)
-             371:   28(fvec4) MatrixTimesVector 369 370
-             372:   25(float) CompositeExtract 371 0
-             373:   25(float) CompositeExtract 371 1
-             374:   25(float) CompositeExtract 371 2
-             375:   89(fvec3) CompositeConstruct 372 373 374
-                              Store 127(outEyePos) 375
-             376:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 377 377 12 12
+             354:   28(fvec4) Load 283(pos)
+             357:   89(fvec3) VectorShuffle 354 354 0 1 2
+                              Store 131(outWorldPos) 357
+             359:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 360 360 12 12
+             358:    326(ptr) AccessChain 71(ubo) 155
+             361:          30 Load 358
+             362:   28(fvec4) Load 283(pos)
+             363:   28(fvec4) MatrixTimesVector 361 362
+             364:   25(float) CompositeExtract 363 0
+             365:   25(float) CompositeExtract 363 1
+             366:   25(float) CompositeExtract 363 2
+             367:   89(fvec3) CompositeConstruct 364 365 366
+                              Store 127(outEyePos) 367
+             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 369 369 12 12
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.vert.out b/Test/baseResults/spv.debuginfo.glsl.vert.out
index d1f425e..36a3142 100644
--- a/Test/baseResults/spv.debuginfo.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.glsl.vert.out
@@ -1,14 +1,14 @@
 spv.debuginfo.glsl.vert
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 471
+// Id's are bound by 469
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
                1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Vertex 14  "main" 32 37 45 49 53 57 63 72 111 115 119 123 127 389
+                              EntryPoint Vertex 14  "main" 32 37 45 49 53 57 63 72 111 115 119 123 127 387
                2:             String  "spv.debuginfo.glsl.vert"
                8:             String  "uint"
               16:             String  "main"
@@ -151,12 +151,12 @@
              344:             String  "locPos"
              357:             String  "pos"
              375:             String  "gl_Position"
-             378:             String  "gl_PointSize"
-             380:             String  "gl_ClipDistance"
-             383:             String  "gl_CullDistance"
-             385:             String  "gl_PerVertex"
-             391:             String  ""
-             439:             String  "lPos"
+             377:             String  "gl_PointSize"
+             379:             String  "gl_ClipDistance"
+             381:             String  "gl_CullDistance"
+             383:             String  "gl_PerVertex"
+             389:             String  ""
+             437:             String  "lPos"
                               Name 14  "main"
                               Name 32  "inPos"
                               Name 37  "inNormal"
@@ -192,8 +192,8 @@
                               MemberName 373(gl_PerVertex) 1  "gl_PointSize"
                               MemberName 373(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 373(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 389  ""
-                              Name 437  "lPos"
+                              Name 387  ""
+                              Name 435  "lPos"
                               Decorate 32(inPos) Location 0
                               Decorate 37(inNormal) Location 1
                               Decorate 45(inUV) Location 2
@@ -390,31 +390,29 @@
              371:             TypeArray 25(float) 22
              372:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 27 22
 373(gl_PerVertex):             TypeStruct 76(fvec4) 25(float) 371 371
-             376:      7(int) Constant 24
-             374:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 375 77 18 22 376 12 12 13
-             377:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 378 27 18 22 91 12 12 13
-             381:      7(int) Constant 61
-             379:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 380 372 18 22 381 12 12 13
-             382:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 383 372 18 22 286 12 12 13
-             386:      7(int) Constant 98
-             384:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 385 22 18 386 12 21 385 12 13 374 377 379 382
-             387:             TypePointer Output 373(gl_PerVertex)
-             388:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 384 13 12
-             389:    387(ptr) Variable Output
-             390:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 391 384 18 386 12 21 391 389 36
-             392:             TypePointer Uniform 78
-             393:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 79 24 12
-             404:             TypePointer Output 76(fvec4)
-             405:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 77 13 12
-             409:      7(int) Constant 99
-             427:      7(int) Constant 101
-             440:      7(int) Constant 102
-             438:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 439 29 18 440 12 17 23
-             452:             TypePointer Uniform 76(fvec4)
-             453:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 77 24 12
-             460:      7(int) Constant 103
-             466:      7(int) Constant 104
-             470:      7(int) Constant 105
+             374:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 375 77 18 12 12 12 12 13
+             376:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 377 27 18 12 12 12 12 13
+             378:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 379 372 18 12 12 12 12 13
+             380:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 381 372 18 12 12 12 12 13
+             384:      7(int) Constant 98
+             382:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 383 22 18 384 12 21 383 12 13 374 376 378 380
+             385:             TypePointer Output 373(gl_PerVertex)
+             386:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 382 13 12
+             387:    385(ptr) Variable Output
+             388:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 389 382 18 384 12 21 389 387 36
+             390:             TypePointer Uniform 78
+             391:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 79 24 12
+             402:             TypePointer Output 76(fvec4)
+             403:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 77 13 12
+             407:      7(int) Constant 99
+             425:      7(int) Constant 101
+             438:      7(int) Constant 102
+             436:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 437 29 18 438 12 17 23
+             450:             TypePointer Uniform 76(fvec4)
+             451:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 77 24 12
+             458:      7(int) Constant 103
+             464:      7(int) Constant 104
+             468:      7(int) Constant 105
         14(main):           4 Function None 5
               15:             Label
          149(mx):    147(ptr) Variable Function
@@ -426,7 +424,7 @@
     296(gRotMat):    294(ptr) Variable Function
      342(locPos):    324(ptr) Variable Function
         355(pos):    324(ptr) Variable Function
-       437(lPos):    200(ptr) Variable Function
+       435(lPos):    200(ptr) Variable Function
              132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
              133:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
              131:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
@@ -611,75 +609,75 @@
              369:   25(float) CompositeExtract 366 2
              370:   76(fvec4) CompositeConstruct 367 368 369 212
                               Store 355(pos) 370
-             395:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 386 386 12 12
-             394:    392(ptr) AccessChain 106(ubo) 193
-             396:          78 Load 394
-             397:    392(ptr) AccessChain 106(ubo) 203
-             398:          78 Load 397
-             399:          78 MatrixTimesMatrix 396 398
-             400:          78 Load 296(gRotMat)
-             401:          78 MatrixTimesMatrix 399 400
-             402:   76(fvec4) Load 355(pos)
-             403:   76(fvec4) MatrixTimesVector 401 402
-             406:    404(ptr) AccessChain 389 193
-                              Store 406 403
-             408:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 409 409 12 12
-             407:    392(ptr) AccessChain 106(ubo) 203
-             410:          78 Load 407
-             411:          78 Load 296(gRotMat)
-             412:          78 MatrixTimesMatrix 410 411
-             413:   76(fvec4) CompositeExtract 412 0
+             393:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 384 384 12 12
+             392:    390(ptr) AccessChain 106(ubo) 193
+             394:          78 Load 392
+             395:    390(ptr) AccessChain 106(ubo) 203
+             396:          78 Load 395
+             397:          78 MatrixTimesMatrix 394 396
+             398:          78 Load 296(gRotMat)
+             399:          78 MatrixTimesMatrix 397 398
+             400:   76(fvec4) Load 355(pos)
+             401:   76(fvec4) MatrixTimesVector 399 400
+             404:    402(ptr) AccessChain 387 193
+                              Store 404 401
+             406:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 407 407 12 12
+             405:    390(ptr) AccessChain 106(ubo) 203
+             408:          78 Load 405
+             409:          78 Load 296(gRotMat)
+             410:          78 MatrixTimesMatrix 408 409
+             411:   76(fvec4) CompositeExtract 410 0
+             412:   28(fvec3) VectorShuffle 411 411 0 1 2
+             413:   76(fvec4) CompositeExtract 410 1
              414:   28(fvec3) VectorShuffle 413 413 0 1 2
-             415:   76(fvec4) CompositeExtract 412 1
+             415:   76(fvec4) CompositeExtract 410 2
              416:   28(fvec3) VectorShuffle 415 415 0 1 2
-             417:   76(fvec4) CompositeExtract 412 2
-             418:   28(fvec3) VectorShuffle 417 417 0 1 2
-             419:         145 CompositeConstruct 414 416 418
-             420:         145 Load 283(rotMat)
-             421:         145 ExtInst 3(GLSL.std.450) 34(MatrixInverse) 420
-             422:         145 MatrixTimesMatrix 419 421
-             423:   28(fvec3) Load 37(inNormal)
-             424:   28(fvec3) MatrixTimesVector 422 423
-                              Store 111(outNormal) 424
-             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 427 427 12 12
-             425:    392(ptr) AccessChain 106(ubo) 203
-             428:          78 Load 425
-             429:   28(fvec3) Load 32(inPos)
-             430:   28(fvec3) Load 53(instancePos)
-             431:   28(fvec3) FAdd 429 430
-             432:   25(float) CompositeExtract 431 0
-             433:   25(float) CompositeExtract 431 1
-             434:   25(float) CompositeExtract 431 2
-             435:   76(fvec4) CompositeConstruct 432 433 434 212
-             436:   76(fvec4) MatrixTimesVector 428 435
-                              Store 355(pos) 436
-             442:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 440 440 12 12
-             441:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 438 437(lPos) 154
-             443:    392(ptr) AccessChain 106(ubo) 203
-             444:          78 Load 443
-             445:   76(fvec4) CompositeExtract 444 0
+             417:         145 CompositeConstruct 412 414 416
+             418:         145 Load 283(rotMat)
+             419:         145 ExtInst 3(GLSL.std.450) 34(MatrixInverse) 418
+             420:         145 MatrixTimesMatrix 417 419
+             421:   28(fvec3) Load 37(inNormal)
+             422:   28(fvec3) MatrixTimesVector 420 421
+                              Store 111(outNormal) 422
+             424:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 425 425 12 12
+             423:    390(ptr) AccessChain 106(ubo) 203
+             426:          78 Load 423
+             427:   28(fvec3) Load 32(inPos)
+             428:   28(fvec3) Load 53(instancePos)
+             429:   28(fvec3) FAdd 427 428
+             430:   25(float) CompositeExtract 429 0
+             431:   25(float) CompositeExtract 429 1
+             432:   25(float) CompositeExtract 429 2
+             433:   76(fvec4) CompositeConstruct 430 431 432 212
+             434:   76(fvec4) MatrixTimesVector 426 433
+                              Store 355(pos) 434
+             440:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 438 438 12 12
+             439:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 436 435(lPos) 154
+             441:    390(ptr) AccessChain 106(ubo) 203
+             442:          78 Load 441
+             443:   76(fvec4) CompositeExtract 442 0
+             444:   28(fvec3) VectorShuffle 443 443 0 1 2
+             445:   76(fvec4) CompositeExtract 442 1
              446:   28(fvec3) VectorShuffle 445 445 0 1 2
-             447:   76(fvec4) CompositeExtract 444 1
+             447:   76(fvec4) CompositeExtract 442 2
              448:   28(fvec3) VectorShuffle 447 447 0 1 2
-             449:   76(fvec4) CompositeExtract 444 2
-             450:   28(fvec3) VectorShuffle 449 449 0 1 2
-             451:         145 CompositeConstruct 446 448 450
-             454:    452(ptr) AccessChain 106(ubo) 211
-             455:   76(fvec4) Load 454
-             456:   28(fvec3) VectorShuffle 455 455 0 1 2
-             457:   28(fvec3) MatrixTimesVector 451 456
-                              Store 437(lPos) 457
-             459:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 460 460 12 12
-             458:   28(fvec3) Load 437(lPos)
-             461:   76(fvec4) Load 355(pos)
-             462:   28(fvec3) VectorShuffle 461 461 0 1 2
-             463:   28(fvec3) FSub 458 462
-                              Store 127(outLightVec) 463
-             465:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 466 466 12 12
-             464:   76(fvec4) Load 355(pos)
-             467:   28(fvec3) VectorShuffle 464 464 0 1 2
-             468:   28(fvec3) FNegate 467
-                              Store 123(outViewVec) 468
-             469:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 470 470 12 12
+             449:         145 CompositeConstruct 444 446 448
+             452:    450(ptr) AccessChain 106(ubo) 211
+             453:   76(fvec4) Load 452
+             454:   28(fvec3) VectorShuffle 453 453 0 1 2
+             455:   28(fvec3) MatrixTimesVector 449 454
+                              Store 435(lPos) 455
+             457:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 458 458 12 12
+             456:   28(fvec3) Load 435(lPos)
+             459:   76(fvec4) Load 355(pos)
+             460:   28(fvec3) VectorShuffle 459 459 0 1 2
+             461:   28(fvec3) FSub 456 460
+                              Store 127(outLightVec) 461
+             463:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 464 464 12 12
+             462:   76(fvec4) Load 355(pos)
+             465:   28(fvec3) VectorShuffle 462 462 0 1 2
+             466:   28(fvec3) FNegate 465
+                              Store 123(outViewVec) 466
+             467:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 468 468 12 12
                               Return
                               FunctionEnd