diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index b53c519d..309b4079 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1558,8 +1558,13 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
             this->options.generateDebugInfo = true;
 
     if (this->options.generateDebugInfo) {
-        builder.setEmitOpLines();
-        builder.setSourceFile(glslangIntermediate->getSourceFile());
+        if (this->options.emitNonSemanticShaderDebugInfo) {
+            builder.setEmitNonSemanticShaderDebugInfo(this->options.emitNonSemanticShaderDebugSource);
+        }
+        else {
+            builder.setEmitSpirvDebugInfo();
+        }
+        builder.setDebugSourceFile(glslangIntermediate->getSourceFile());
 
         // Set the source shader's text. If for SPV version 1.0, include
         // a preamble in comments stating the OpModuleProcessed instructions.
@@ -1584,9 +1589,6 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
             builder.addInclude(iItr->first, iItr->second);
     }
 
-    builder.setEmitNonSemanticShaderDebugInfo(this->options.emitNonSemanticShaderDebugInfo);
-    builder.setEmitNonSemanticShaderDebugSource(this->options.emitNonSemanticShaderDebugSource);
-
     stdBuiltins = builder.import("GLSL.std.450");
 
     spv::AddressingModel addressingModel = spv::AddressingModelLogical;
@@ -2037,7 +2039,9 @@ void TGlslangToSpvTraverser::visitSymbol(glslang::TIntermSymbol* symbol)
 {
     // We update the line information even though no code might be generated here
     // This is helpful to yield correct lines for control flow instructions
-    builder.setLine(symbol->getLoc().line, symbol->getLoc().getFilename());
+    if (!linkageOnly) {
+        builder.setDebugSourceLocation(symbol->getLoc().line, symbol->getLoc().getFilename());
+    }
 
     SpecConstantOpModeGuard spec_constant_op_mode_setter(&builder);
     if (symbol->getType().isStruct())
@@ -2146,7 +2150,7 @@ void TGlslangToSpvTraverser::visitSymbol(glslang::TIntermSymbol* symbol)
 
 bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::TIntermBinary* node)
 {
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
     if (node->getLeft()->getAsSymbolNode() != nullptr && node->getLeft()->getType().isStruct()) {
         glslangTypeToIdMap[node->getLeft()->getType().getStruct()] = node->getLeft()->getAsSymbolNode()->getId();
     }
@@ -2191,7 +2195,7 @@ bool TGlslangToSpvTraverser::visitBinary(glslang::TVisit /* visit */, glslang::T
             spv::Id rValue = accessChainLoad(node->getRight()->getType());
 
             // reset line number for assignment
-            builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+            builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
 
             if (node->getOp() != glslang::EOpAssign) {
                 // the left is also an r-value
@@ -2524,7 +2528,7 @@ spv::Id TGlslangToSpvTraverser::translateForcedType(spv::Id object)
 
 bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TIntermUnary* node)
 {
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
 
     SpecConstantOpModeGuard spec_constant_op_mode_setter(&builder);
     if (node->getType().getQualifier().isSpecConstant())
@@ -2912,11 +2916,11 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
                 return false;
             } else {
                 if (node->getOp() == glslang::EOpScope)
-                    builder.enterScope(0);
+                    builder.enterLexicalBlock(0);
             }
         } else {
             if (sequenceDepth > 1 && node->getOp() == glslang::EOpScope)
-                builder.leaveScope();
+                builder.leaveLexicalBlock();
             --sequenceDepth;
         }
 
@@ -2943,6 +2947,9 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     }
     case glslang::EOpFunction:
         if (visit == glslang::EvPreVisit) {
+            if (options.generateDebugInfo) {
+                builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
+            }
             if (isShaderEntryPoint(node)) {
                 inEntryPoint = true;
                 builder.setBuildPoint(shaderEntry->getLastBlock());
@@ -2951,10 +2958,10 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
             } else {
                 handleFunctionEntry(node);
             }
-            if (options.generateDebugInfo) {
+            if (options.generateDebugInfo && !options.emitNonSemanticShaderDebugInfo) {
                 const auto& loc = node->getLoc();
                 const char* sourceFileName = loc.getFilename();
-                spv::Id sourceFileId = sourceFileName ? builder.getStringId(sourceFileName) : builder.getSourceFile();
+                spv::Id sourceFileId = sourceFileName ? builder.getStringId(sourceFileName) : builder.getMainFileId();
                 currentFunction->setDebugLineInfo(sourceFileId, loc.line, loc.column);
             }
         } else {
@@ -2972,7 +2979,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         return false;
     case glslang::EOpFunctionCall:
     {
-        builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+        builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
         if (node->isUserDefined())
             result = handleUserFunctionCall(node);
         if (result) {
@@ -3093,7 +3100,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
     case glslang::EOpConstructCooperativeMatrixNV:
     case glslang::EOpConstructCooperativeMatrixKHR:
     {
-        builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+        builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
         std::vector<spv::Id> arguments;
         translateArguments(*node, arguments, lvalueCoherentFlags);
         spv::Id constructed;
@@ -3379,7 +3386,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         right->traverse(this);
         spv::Id rightId = accessChainLoad(right->getType());
 
-        builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+        builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
         OpDecorations decorations = { precision,
                                       TranslateNoContractionDecoration(node->getType().getQualifier()),
                                       TranslateNonUniformDecoration(node->getType().getQualifier()) };
@@ -3614,7 +3621,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
             lvalueCoherentFlags = builder.getAccessChain().coherentFlags;
             lvalueCoherentFlags |= TranslateCoherent(glslangOperands[arg]->getAsTyped()->getType());
         } else {
-            builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+            builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
              glslang::TOperator glslangOp = node->getOp();
              if (arg == 1 &&
                 (glslangOp == glslang::EOpRayQueryGetIntersectionType ||
@@ -3666,7 +3673,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
         }
     }
 
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
     if (node->getOp() == glslang::EOpCooperativeMatrixLoad ||
         node->getOp() == glslang::EOpCooperativeMatrixLoadNV) {
         std::vector<spv::IdImmediate> idImmOps;
@@ -3906,7 +3913,7 @@ bool TGlslangToSpvTraverser::visitSelection(glslang::TVisit /* visit */, glslang
         node->getFalseBlock()->traverse(this);
         spv::Id falseValue = accessChainLoad(node->getFalseBlock()->getAsTyped()->getType());
 
-        builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+        builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
 
         // done if void
         if (node->getBasicType() == glslang::EbtVoid)
@@ -4114,7 +4121,7 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
     // instructions in it, since the body/test may have arbitrary instructions,
     // including merges of its own.
     builder.setBuildPoint(&blocks.head);
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
     builder.createLoopMerge(&blocks.merge, &blocks.continue_target, control, operands);
     if (node->testFirst() && node->getTest()) {
         spv::Block& test = builder.makeNewBlock();
@@ -4137,7 +4144,7 @@ bool TGlslangToSpvTraverser::visitLoop(glslang::TVisit /* visit */, glslang::TIn
             node->getTerminal()->traverse(this);
         builder.createBranch(&blocks.head);
     } else {
-        builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+        builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
         builder.createBranch(&blocks.body);
 
         breakForLoop.push(true);
@@ -4172,7 +4179,7 @@ bool TGlslangToSpvTraverser::visitBranch(glslang::TVisit /* visit */, glslang::T
     if (node->getExpression())
         node->getExpression()->traverse(this);
 
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
 
     switch (node->getFlowOp()) {
     case glslang::EOpKill:
@@ -5756,7 +5763,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
     if (! node->isImage() && ! node->isTexture())
         return spv::NoResult;
 
-    builder.setLine(node->getLoc().line, node->getLoc().getFilename());
+    builder.setDebugSourceLocation(node->getLoc().line, node->getLoc().getFilename());
 
     // Process a GLSL texturing op (will be SPV image)
 
diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index b6752d2d..694413ef 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -58,13 +58,6 @@ Builder::Builder(unsigned int spvVersion, unsigned int magicNumber, SpvBuildLogg
     spvVersion(spvVersion),
     sourceLang(SourceLanguageUnknown),
     sourceVersion(0),
-    sourceFileStringId(NoResult),
-    currentLine(0),
-    currentFile(nullptr),
-    currentFileId(NoResult),
-    lastDebugScopeId(NoResult),
-    emitOpLines(false),
-    emitNonSemanticShaderDebugInfo(false),
     addressModel(AddressingModelLogical),
     memoryModel(MemoryModelGLSL450),
     builderNumber(magicNumber),
@@ -91,78 +84,6 @@ Id Builder::import(const char* name)
     return import->getResultId();
 }
 
-// Emit instruction for non-filename-based #line directives (ie. no filename
-// seen yet): emit an OpLine if we've been asked to emit OpLines and the line
-// number has changed since the last time, and is a valid line number.
-void Builder::setLine(int lineNum)
-{
-    if (lineNum != 0 && lineNum != currentLine) {
-        currentLine = lineNum;
-        if (emitOpLines) {
-          if (emitNonSemanticShaderDebugInfo)
-              addDebugScopeAndLine(currentFileId, currentLine, 0);
-          else
-              addLine(sourceFileStringId, currentLine, 0);
-        }
-    }
-}
-
-// If no filename, do non-filename-based #line emit. Else do filename-based emit.
-// Emit OpLine if we've been asked to emit OpLines and the line number or filename
-// has changed since the last time, and line number is valid.
-void Builder::setLine(int lineNum, const char* filename)
-{
-    if (filename == nullptr) {
-        setLine(lineNum);
-        return;
-    }
-    if ((lineNum != 0 && lineNum != currentLine) || currentFile == nullptr ||
-            strncmp(filename, currentFile, strlen(currentFile) + 1) != 0) {
-        currentLine = lineNum;
-        currentFile = filename;
-        if (emitOpLines) {
-            spv::Id strId = getStringId(filename);
-            if (emitNonSemanticShaderDebugInfo)
-                addDebugScopeAndLine(strId, currentLine, 0);
-            else
-                addLine(strId, currentLine, 0);
-        }
-    }
-}
-
-void Builder::addLine(Id fileName, int lineNum, int column)
-{
-    Instruction* line = new Instruction(OpLine);
-    line->addIdOperand(fileName);
-    line->addImmediateOperand(lineNum);
-    line->addImmediateOperand(column);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(line));
-}
-
-void Builder::addDebugScopeAndLine(Id fileName, int lineNum, int column)
-{
-    assert(!currentDebugScopeId.empty());
-    if (currentDebugScopeId.top() != lastDebugScopeId) {
-        spv::Id resultId = getUniqueId();
-        Instruction* scopeInst = new Instruction(resultId, makeVoidType(), OpExtInst);
-        scopeInst->addIdOperand(nonSemanticShaderDebugInfo);
-        scopeInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugScope);
-        scopeInst->addIdOperand(currentDebugScopeId.top());
-        buildPoint->addInstruction(std::unique_ptr<Instruction>(scopeInst));
-        lastDebugScopeId = currentDebugScopeId.top();
-    }
-    spv::Id resultId = getUniqueId();
-    Instruction* lineInst = new Instruction(resultId, makeVoidType(), OpExtInst);
-    lineInst->addIdOperand(nonSemanticShaderDebugInfo);
-    lineInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLine);
-    lineInst->addIdOperand(makeDebugSource(fileName));
-    lineInst->addIdOperand(makeUintConstant(lineNum));
-    lineInst->addIdOperand(makeUintConstant(lineNum));
-    lineInst->addIdOperand(makeUintConstant(column));
-    lineInst->addIdOperand(makeUintConstant(column));
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(lineInst));
-}
-
 // For creating new groupedTypes (will return old type if the requested one was already made).
 Id Builder::makeVoidType()
 {
@@ -1011,7 +932,7 @@ Id Builder::makeMemberDebugType(Id const memberType, DebugTypeLoc const& debugTy
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeMember);
     type->addIdOperand(getStringId(debugTypeLoc.name)); // name id
     type->addIdOperand(debugId[memberType]); // type id
-    type->addIdOperand(makeDebugSource(sourceFileStringId)); // source id TODO: verify this works across include directives
+    type->addIdOperand(makeDebugSource(currentFileId)); // source id
     type->addIdOperand(makeUintConstant(debugTypeLoc.line)); // line id TODO: currentLine is always zero
     type->addIdOperand(makeUintConstant(debugTypeLoc.column)); // TODO: column id
     type->addIdOperand(makeUintConstant(0)); // TODO: offset id
@@ -1050,7 +971,7 @@ Id Builder::makeCompositeDebugType(std::vector<Id> const& memberTypes, char cons
     type->addImmediateOperand(NonSemanticShaderDebugInfo100DebugTypeComposite);
     type->addIdOperand(getStringId(name)); // name id
     type->addIdOperand(makeUintConstant(tag)); // tag id
-    type->addIdOperand(makeDebugSource(sourceFileStringId)); // source id TODO: verify this works across include directives
+    type->addIdOperand(makeDebugSource(currentFileId)); // source id
     type->addIdOperand(makeUintConstant(currentLine)); // line id TODO: currentLine always zero?
     type->addIdOperand(makeUintConstant(0)); // TODO: column id
     type->addIdOperand(makeDebugCompilationUnit()); // scope id
@@ -1113,14 +1034,19 @@ Id Builder::makeDebugSource(const Id fileName) {
     sourceInst->addIdOperand(fileName);
     if (emitNonSemanticShaderDebugSource) {
         spv::Id sourceId = 0;
-        if (fileName == sourceFileStringId) {
+        if (fileName == mainFileId) {
             sourceId = getStringId(sourceText);
         } else {
             auto incItr = includeFiles.find(fileName);
-            assert(incItr != includeFiles.end());
-            sourceId = getStringId(*incItr->second);
+            if (incItr != includeFiles.end()) {
+                sourceId = getStringId(*incItr->second);
+            }
+        }
+
+        // We omit the optional source text item if not available in glslang
+        if (sourceId != 0) {
+            sourceInst->addIdOperand(sourceId);
         }
-        sourceInst->addIdOperand(sourceId);
     }
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(sourceInst));
     module.mapInstruction(sourceInst);
@@ -1137,7 +1063,7 @@ Id Builder::makeDebugCompilationUnit() {
     sourceInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugCompilationUnit);
     sourceInst->addIdOperand(makeUintConstant(1)); // TODO(greg-lunarg): Get rid of magic number
     sourceInst->addIdOperand(makeUintConstant(4)); // TODO(greg-lunarg): Get rid of magic number
-    sourceInst->addIdOperand(makeDebugSource(sourceFileStringId));
+    sourceInst->addIdOperand(makeDebugSource(mainFileId));
     sourceInst->addIdOperand(makeUintConstant(sourceLang));
     constantsTypesGlobals.push_back(std::unique_ptr<Instruction>(sourceInst));
     module.mapInstruction(sourceInst);
@@ -1160,7 +1086,7 @@ Id Builder::createDebugGlobalVariable(Id const type, char const*const name, Id c
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugGlobalVariable);
     inst->addIdOperand(getStringId(name)); // name id
     inst->addIdOperand(type); // type id
-    inst->addIdOperand(makeDebugSource(sourceFileStringId)); // source id
+    inst->addIdOperand(makeDebugSource(currentFileId)); // source id
     inst->addIdOperand(makeUintConstant(currentLine)); // line id TODO: currentLine always zero?
     inst->addIdOperand(makeUintConstant(0)); // TODO: column id
     inst->addIdOperand(makeDebugCompilationUnit()); // scope id
@@ -1184,7 +1110,7 @@ Id Builder::createDebugLocalVariable(Id type, char const*const name, size_t cons
     inst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLocalVariable);
     inst->addIdOperand(getStringId(name)); // name id
     inst->addIdOperand(type); // type id
-    inst->addIdOperand(makeDebugSource(sourceFileStringId)); // source id
+    inst->addIdOperand(makeDebugSource(currentFileId)); // source id
     inst->addIdOperand(makeUintConstant(currentLine)); // line id
     inst->addIdOperand(makeUintConstant(0)); // TODO: column id
     inst->addIdOperand(currentDebugScopeId.top()); // scope id
@@ -1224,7 +1150,7 @@ Id Builder::makeDebugDeclare(Id const debugLocalVariable, Id const pointer)
     inst->addIdOperand(debugLocalVariable); // debug local variable id
     inst->addIdOperand(pointer); // pointer to local variable id
     inst->addIdOperand(makeDebugExpression()); // expression id
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(inst));
+    addInstruction(std::unique_ptr<Instruction>(inst));
 
     return inst->getResultId();
 }
@@ -1237,7 +1163,7 @@ Id Builder::makeDebugValue(Id const debugLocalVariable, Id const value)
     inst->addIdOperand(debugLocalVariable); // debug local variable id
     inst->addIdOperand(value); // value of local variable id
     inst->addIdOperand(makeDebugExpression()); // expression id
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(inst));
+    addInstruction(std::unique_ptr<Instruction>(inst));
 
     return inst->getResultId();
 }
@@ -2103,6 +2029,49 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     decorations.push_back(std::unique_ptr<Instruction>(dec));
 }
 
+void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
+    // Optionally insert OpDebugScope
+    if (emitNonSemanticShaderDebugInfo && dirtyScopeTracker) {
+        if (buildPoint->updateDebugScope(currentDebugScopeId.top())) {
+            auto scopeInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), OpExtInst);
+            scopeInst->addIdOperand(nonSemanticShaderDebugInfo);
+            scopeInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugScope);
+            scopeInst->addIdOperand(currentDebugScopeId.top());
+            buildPoint->addInstruction(std::move(scopeInst));
+        }
+
+        dirtyScopeTracker = false;
+    }
+
+    // Insert OpLine/OpDebugLine if the debug source location has changed
+    if (trackDebugInfo && dirtyLineTracker) {
+        if (buildPoint->updateDebugSourceLocation(currentLine, 0, currentFileId)) {
+            if (emitSpirvDebugInfo) {
+                auto lineInst = std::make_unique<Instruction>(OpLine);
+                lineInst->addIdOperand(currentFileId);
+                lineInst->addImmediateOperand(currentLine);
+                lineInst->addImmediateOperand(0);
+                buildPoint->addInstruction(std::move(lineInst));
+            }
+            if (emitNonSemanticShaderDebugInfo) {
+                auto lineInst = std::make_unique<Instruction>(getUniqueId(), makeVoidType(), OpExtInst);
+                lineInst->addIdOperand(nonSemanticShaderDebugInfo);
+                lineInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugLine);
+                lineInst->addIdOperand(makeDebugSource(currentFileId));
+                lineInst->addIdOperand(makeUintConstant(currentLine));
+                lineInst->addIdOperand(makeUintConstant(currentLine));
+                lineInst->addIdOperand(makeUintConstant(0));
+                lineInst->addIdOperand(makeUintConstant(0));
+                buildPoint->addInstruction(std::move(lineInst));
+            }
+        }
+
+        dirtyLineTracker = false;
+    }
+
+    buildPoint->addInstruction(std::move(inst));
+}
+
 // Comments in header
 Function* Builder::makeEntryPoint(const char* entryPoint)
 {
@@ -2146,7 +2115,7 @@ Function* Builder::makeFunctionEntry(Decoration precision, Id returnType, const
 
     // reset last debug scope
     if (emitNonSemanticShaderDebugInfo) {
-        lastDebugScopeId = NoResult;
+        dirtyScopeTracker = true;
     }
 
     // CFG
@@ -2186,8 +2155,6 @@ void Builder::setupDebugFunctionEntry(Function* function, const char* name, int
     // DebugScope and DebugLine for parameter DebugDeclares
     assert(paramTypes.size() == paramNames.size());
     if ((int)paramTypes.size() > 0) {
-        addDebugScopeAndLine(currentFileId, currentLine, 0);
-
         Id firstParamId = function->getParamId(0);
 
         for (size_t p = 0; p < paramTypes.size(); ++p) {
@@ -2276,29 +2243,29 @@ void Builder::makeReturn(bool implicit, Id retVal)
     if (retVal) {
         Instruction* inst = new Instruction(NoResult, NoType, OpReturnValue);
         inst->addIdOperand(retVal);
-        buildPoint->addInstruction(std::unique_ptr<Instruction>(inst));
+        addInstruction(std::unique_ptr<Instruction>(inst));
     } else
-        buildPoint->addInstruction(std::unique_ptr<Instruction>(new Instruction(NoResult, NoType, OpReturn)));
+        addInstruction(std::unique_ptr<Instruction>(new Instruction(NoResult, NoType, OpReturn)));
 
     if (! implicit)
         createAndSetNoPredecessorBlock("post-return");
 }
 
 // Comments in header
-void Builder::enterScope(uint32_t line)
+void Builder::enterLexicalBlock(uint32_t line)
 {
     // Generate new lexical scope debug instruction
     Id lexId = makeDebugLexicalBlock(line);
     currentDebugScopeId.push(lexId);
-    lastDebugScopeId = NoResult;
+    dirtyScopeTracker = true;
 }
 
 // Comments in header
-void Builder::leaveScope()
+void Builder::leaveLexicalBlock()
 {
     // Pop current scope from stack and clear current scope
     currentDebugScopeId.pop();
-    lastDebugScopeId = NoResult;
+    dirtyScopeTracker = true;
 }
 
 // Comments in header
@@ -2322,7 +2289,7 @@ void Builder::enterFunction(Function const* function)
         defInst->addImmediateOperand(NonSemanticShaderDebugInfo100DebugFunctionDefinition);
         defInst->addIdOperand(debugId[funcId]);
         defInst->addIdOperand(funcId);
-        buildPoint->addInstruction(std::unique_ptr<Instruction>(defInst));
+        addInstruction(std::unique_ptr<Instruction>(defInst));
     }
 
     if (auto linkType = function->getLinkType(); linkType != LinkageTypeMax) {
@@ -2358,7 +2325,7 @@ void Builder::leaveFunction()
 // Comments in header
 void Builder::makeStatementTerminator(spv::Op opcode, const char *name)
 {
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(new Instruction(opcode)));
+    addInstruction(std::unique_ptr<Instruction>(new Instruction(opcode)));
     createAndSetNoPredecessorBlock(name);
 }
 
@@ -2420,7 +2387,7 @@ Id Builder::createVariable(Decoration precision, StorageClass storageClass, Id t
 Id Builder::createUndefined(Id type)
 {
   Instruction* inst = new Instruction(getUniqueId(), type, OpUndef);
-  buildPoint->addInstruction(std::unique_ptr<Instruction>(inst));
+  addInstruction(std::unique_ptr<Instruction>(inst));
   return inst->getResultId();
 }
 
@@ -2464,7 +2431,7 @@ void Builder::createStore(Id rValue, Id lValue, spv::MemoryAccessMask memoryAcce
         }
     }
 
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(store));
+    addInstruction(std::unique_ptr<Instruction>(store));
 }
 
 // Comments in header
@@ -2486,7 +2453,7 @@ Id Builder::createLoad(Id lValue, spv::Decoration precision, spv::MemoryAccessMa
         }
     }
 
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(load));
+    addInstruction(std::unique_ptr<Instruction>(load));
     setPrecision(load->getResultId(), precision);
 
     return load->getResultId();
@@ -2504,7 +2471,7 @@ Id Builder::createAccessChain(StorageClass storageClass, Id base, const std::vec
     chain->addIdOperand(base);
     for (int i = 0; i < (int)offsets.size(); ++i)
         chain->addIdOperand(offsets[i]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(chain));
+    addInstruction(std::unique_ptr<Instruction>(chain));
 
     return chain->getResultId();
 }
@@ -2515,7 +2482,7 @@ Id Builder::createArrayLength(Id base, unsigned int member)
     Instruction* length = new Instruction(getUniqueId(), intType, OpArrayLength);
     length->addIdOperand(base);
     length->addImmediateOperand(member);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(length));
+    addInstruction(std::unique_ptr<Instruction>(length));
 
     return length->getResultId();
 }
@@ -2532,7 +2499,7 @@ Id Builder::createCooperativeMatrixLengthKHR(Id type)
 
     Instruction* length = new Instruction(getUniqueId(), intType, OpCooperativeMatrixLengthKHR);
     length->addIdOperand(type);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(length));
+    addInstruction(std::unique_ptr<Instruction>(length));
 
     return length->getResultId();
 }
@@ -2549,7 +2516,7 @@ Id Builder::createCooperativeMatrixLengthNV(Id type)
 
     Instruction* length = new Instruction(getUniqueId(), intType, OpCooperativeMatrixLengthNV);
     length->addIdOperand(type);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(length));
+    addInstruction(std::unique_ptr<Instruction>(length));
 
     return length->getResultId();
 }
@@ -2565,7 +2532,7 @@ Id Builder::createCompositeExtract(Id composite, Id typeId, unsigned index)
     Instruction* extract = new Instruction(getUniqueId(), typeId, OpCompositeExtract);
     extract->addIdOperand(composite);
     extract->addImmediateOperand(index);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(extract));
+    addInstruction(std::unique_ptr<Instruction>(extract));
 
     return extract->getResultId();
 }
@@ -2581,7 +2548,7 @@ Id Builder::createCompositeExtract(Id composite, Id typeId, const std::vector<un
     extract->addIdOperand(composite);
     for (int i = 0; i < (int)indexes.size(); ++i)
         extract->addImmediateOperand(indexes[i]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(extract));
+    addInstruction(std::unique_ptr<Instruction>(extract));
 
     return extract->getResultId();
 }
@@ -2592,7 +2559,7 @@ Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, unsigned i
     insert->addIdOperand(object);
     insert->addIdOperand(composite);
     insert->addImmediateOperand(index);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(insert));
+    addInstruction(std::unique_ptr<Instruction>(insert));
 
     return insert->getResultId();
 }
@@ -2604,7 +2571,7 @@ Id Builder::createCompositeInsert(Id object, Id composite, Id typeId, const std:
     insert->addIdOperand(composite);
     for (int i = 0; i < (int)indexes.size(); ++i)
         insert->addImmediateOperand(indexes[i]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(insert));
+    addInstruction(std::unique_ptr<Instruction>(insert));
 
     return insert->getResultId();
 }
@@ -2614,7 +2581,7 @@ Id Builder::createVectorExtractDynamic(Id vector, Id typeId, Id componentIndex)
     Instruction* extract = new Instruction(getUniqueId(), typeId, OpVectorExtractDynamic);
     extract->addIdOperand(vector);
     extract->addIdOperand(componentIndex);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(extract));
+    addInstruction(std::unique_ptr<Instruction>(extract));
 
     return extract->getResultId();
 }
@@ -2625,7 +2592,7 @@ Id Builder::createVectorInsertDynamic(Id vector, Id typeId, Id component, Id com
     insert->addIdOperand(vector);
     insert->addIdOperand(component);
     insert->addIdOperand(componentIndex);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(insert));
+    addInstruction(std::unique_ptr<Instruction>(insert));
 
     return insert->getResultId();
 }
@@ -2634,7 +2601,7 @@ Id Builder::createVectorInsertDynamic(Id vector, Id typeId, Id component, Id com
 void Builder::createNoResultOp(Op opCode)
 {
     Instruction* op = new Instruction(opCode);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 // An opcode that has one id operand, no result id, and no type
@@ -2642,7 +2609,7 @@ void Builder::createNoResultOp(Op opCode, Id operand)
 {
     Instruction* op = new Instruction(opCode);
     op->addIdOperand(operand);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 // An opcode that has one or more operands, no result id, and no type
@@ -2652,7 +2619,7 @@ void Builder::createNoResultOp(Op opCode, const std::vector<Id>& operands)
     for (auto it = operands.cbegin(); it != operands.cend(); ++it) {
         op->addIdOperand(*it);
     }
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 // An opcode that has multiple operands, no result id, and no type
@@ -2665,7 +2632,7 @@ void Builder::createNoResultOp(Op opCode, const std::vector<IdImmediate>& operan
         else
             op->addImmediateOperand(it->word);
     }
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 void Builder::createControlBarrier(Scope execution, Scope memory, MemorySemanticsMask semantics)
@@ -2674,7 +2641,7 @@ void Builder::createControlBarrier(Scope execution, Scope memory, MemorySemantic
     op->addIdOperand(makeUintConstant(execution));
     op->addIdOperand(makeUintConstant(memory));
     op->addIdOperand(makeUintConstant(semantics));
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 void Builder::createMemoryBarrier(unsigned executionScope, unsigned memorySemantics)
@@ -2682,7 +2649,7 @@ void Builder::createMemoryBarrier(unsigned executionScope, unsigned memorySemant
     Instruction* op = new Instruction(OpMemoryBarrier);
     op->addIdOperand(makeUintConstant(executionScope));
     op->addIdOperand(makeUintConstant(memorySemantics));
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 }
 
 // An opcode that has one operands, a result id, and a type
@@ -2695,7 +2662,7 @@ Id Builder::createUnaryOp(Op opCode, Id typeId, Id operand)
     }
     Instruction* op = new Instruction(getUniqueId(), typeId, opCode);
     op->addIdOperand(operand);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2712,7 +2679,7 @@ Id Builder::createBinOp(Op opCode, Id typeId, Id left, Id right)
     Instruction* op = new Instruction(getUniqueId(), typeId, opCode);
     op->addIdOperand(left);
     op->addIdOperand(right);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2733,7 +2700,7 @@ Id Builder::createTriOp(Op opCode, Id typeId, Id op1, Id op2, Id op3)
     op->addIdOperand(op1);
     op->addIdOperand(op2);
     op->addIdOperand(op3);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2743,7 +2710,7 @@ Id Builder::createOp(Op opCode, Id typeId, const std::vector<Id>& operands)
     Instruction* op = new Instruction(getUniqueId(), typeId, opCode);
     for (auto it = operands.cbegin(); it != operands.cend(); ++it)
         op->addIdOperand(*it);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2757,7 +2724,7 @@ Id Builder::createOp(Op opCode, Id typeId, const std::vector<IdImmediate>& opera
         else
             op->addImmediateOperand(it->word);
     }
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2791,7 +2758,7 @@ Id Builder::createFunctionCall(spv::Function* function, const std::vector<spv::I
     op->addIdOperand(function->getId());
     for (int a = 0; a < (int)args.size(); ++a)
         op->addIdOperand(args[a]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -2813,7 +2780,7 @@ Id Builder::createRvalueSwizzle(Decoration precision, Id typeId, Id source, cons
     swizzle->addIdOperand(source);
     for (int i = 0; i < (int)channels.size(); ++i)
         swizzle->addImmediateOperand(channels[i]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(swizzle));
+    addInstruction(std::unique_ptr<Instruction>(swizzle));
 
     return setPrecision(swizzle->getResultId(), precision);
 }
@@ -2846,7 +2813,7 @@ Id Builder::createLvalueSwizzle(Id typeId, Id target, Id source, const std::vect
     // finish the instruction with these components selectors
     for (int i = 0; i < numTargetComponents; ++i)
         swizzle->addImmediateOperand(components[i]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(swizzle));
+    addInstruction(std::unique_ptr<Instruction>(swizzle));
 
     return swizzle->getResultId();
 }
@@ -2891,7 +2858,7 @@ Id Builder::smearScalar(Decoration precision, Id scalar, Id vectorType)
         smear = new Instruction(getUniqueId(), vectorType, OpCompositeConstruct);
         for (int c = 0; c < numComponents; ++c)
             smear->addIdOperand(scalar);
-        buildPoint->addInstruction(std::unique_ptr<Instruction>(smear));
+        addInstruction(std::unique_ptr<Instruction>(smear));
     }
 
     return setPrecision(smear->getResultId(), precision);
@@ -2906,7 +2873,7 @@ Id Builder::createBuiltinCall(Id resultType, Id builtins, int entryPoint, const
     for (int arg = 0; arg < (int)args.size(); ++arg)
         inst->addIdOperand(args[arg]);
 
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(inst));
+    addInstruction(std::unique_ptr<Instruction>(inst));
 
     return inst->getResultId();
 }
@@ -3102,7 +3069,7 @@ Id Builder::createTextureCall(Decoration precision, Id resultType, bool sparse,
     for (size_t op = optArgNum + 1; op < texArgs.size(); ++op)
         textureInst->addIdOperand(texArgs[op]);
     setPrecision(textureInst->getResultId(), precision);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(textureInst));
+    addInstruction(std::unique_ptr<Instruction>(textureInst));
 
     Id resultId = textureInst->getResultId();
 
@@ -3182,7 +3149,7 @@ Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameter
         query->addIdOperand(parameters.coords);
     if (parameters.lod)
         query->addIdOperand(parameters.lod);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(query));
+    addInstruction(std::unique_ptr<Instruction>(query));
     addCapability(CapabilityImageQuery);
 
     return query->getResultId();
@@ -3281,7 +3248,7 @@ Id Builder::createCompositeConstruct(Id typeId, const std::vector<Id>& constitue
     Instruction* op = new Instruction(getUniqueId(), typeId, OpCompositeConstruct);
     for (int c = 0; c < (int)constituents.size(); ++c)
         op->addIdOperand(constituents[c]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(op));
+    addInstruction(std::unique_ptr<Instruction>(op));
 
     return op->getResultId();
 }
@@ -3577,7 +3544,7 @@ void Builder::makeSwitch(Id selector, unsigned int control, int numSegments, con
         switchInst->addIdOperand(segmentBlocks[valueIndexToSegment[i]]->getId());
         segmentBlocks[valueIndexToSegment[i]]->addPredecessor(buildPoint);
     }
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(switchInst));
+    addInstruction(std::unique_ptr<Instruction>(switchInst));
 
     // push the merge block
     switchMerges.push(mergeBlock);
@@ -4096,7 +4063,7 @@ void Builder::createBranch(Block* block)
 {
     Instruction* branch = new Instruction(OpBranch);
     branch->addIdOperand(block->getId());
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(branch));
+    addInstruction(std::unique_ptr<Instruction>(branch));
     block->addPredecessor(buildPoint);
 }
 
@@ -4105,7 +4072,7 @@ void Builder::createSelectionMerge(Block* mergeBlock, unsigned int control)
     Instruction* merge = new Instruction(OpSelectionMerge);
     merge->addIdOperand(mergeBlock->getId());
     merge->addImmediateOperand(control);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(merge));
+    addInstruction(std::unique_ptr<Instruction>(merge));
 }
 
 void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned int control,
@@ -4117,7 +4084,7 @@ void Builder::createLoopMerge(Block* mergeBlock, Block* continueBlock, unsigned
     merge->addImmediateOperand(control);
     for (int op = 0; op < (int)operands.size(); ++op)
         merge->addImmediateOperand(operands[op]);
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(merge));
+    addInstruction(std::unique_ptr<Instruction>(merge));
 }
 
 void Builder::createConditionalBranch(Id condition, Block* thenBlock, Block* elseBlock)
@@ -4126,7 +4093,7 @@ void Builder::createConditionalBranch(Id condition, Block* thenBlock, Block* els
     branch->addIdOperand(condition);
     branch->addIdOperand(thenBlock->getId());
     branch->addIdOperand(elseBlock->getId());
-    buildPoint->addInstruction(std::unique_ptr<Instruction>(branch));
+    addInstruction(std::unique_ptr<Instruction>(branch));
     thenBlock->addPredecessor(buildPoint);
     elseBlock->addPredecessor(buildPoint);
 }
@@ -4178,7 +4145,7 @@ void Builder::dumpSourceInstructions(const spv::Id fileId, const std::string& te
 void Builder::dumpSourceInstructions(std::vector<unsigned int>& out) const
 {
     if (emitNonSemanticShaderDebugInfo) return;
-    dumpSourceInstructions(sourceFileStringId, sourceText, out);
+    dumpSourceInstructions(mainFileId, sourceText, out);
     for (auto iItr = includeFiles.begin(); iItr != includeFiles.end(); ++iItr)
         dumpSourceInstructions(iItr->first, *iItr->second, out);
 }
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index dac5881b..17949e40 100644
--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -103,31 +103,53 @@ public:
         stringIds[file_c_str] = strId;
         return strId;
     }
-    spv::Id getSourceFile() const
+
+    spv::Id getMainFileId() const { return mainFileId; }
+
+    // Initialize the main source file name
+    void setDebugSourceFile(const std::string& file)
     {
-        return sourceFileStringId;
+        if (trackDebugInfo) {
+            dirtyLineTracker = true;
+            mainFileId = getStringId(file);
+            currentFileId = mainFileId;
+        }
     }
-    void setSourceFile(const std::string& file)
+
+    // Set the debug source location tracker in the builder.
+    // The upcoming instructions in basic blocks will be associated to this location.
+    void setDebugSourceLocation(int line, const char* filename)
     {
-        sourceFileStringId = getStringId(file);
-        currentFileId = sourceFileStringId;
+        if (trackDebugInfo) {
+            dirtyLineTracker = true;
+            if (line != 0) {
+                // TODO: This is special handling of some AST nodes having (untracked) line 0. 
+                //       But they should have a valid line number.
+                currentLine = line;
+                if (filename) {
+                    currentFileId = getStringId(filename);
+                }
+            }
+        }
     }
+
     void setSourceText(const std::string& text) { sourceText = text; }
     void addSourceExtension(const char* ext) { sourceExtensions.push_back(ext); }
     void addModuleProcessed(const std::string& p) { moduleProcesses.push_back(p.c_str()); }
-    void setEmitOpLines() { emitOpLines = true; }
-    void setEmitNonSemanticShaderDebugInfo(bool const emit)
+    void setEmitSpirvDebugInfo()
     {
-        emitNonSemanticShaderDebugInfo = emit;
-
-        if(emit)
-        {
-            importNonSemanticShaderDebugInfoInstructions();
-        }
+        trackDebugInfo = true;
+        emitSpirvDebugInfo = true;
     }
-    void setEmitNonSemanticShaderDebugSource(bool const src)
+    void setEmitNonSemanticShaderDebugInfo(bool emitSourceText)
     {
-        emitNonSemanticShaderDebugSource = src;
+        trackDebugInfo = true;
+        emitNonSemanticShaderDebugInfo = true;
+        importNonSemanticShaderDebugInfoInstructions();
+
+        if (emitSourceText) {
+            emitNonSemanticShaderDebugSource = emitSourceText;
+        }
     }
     void addExtension(const char* ext) { extensions.insert(ext); }
     void removeExtension(const char* ext)
@@ -169,20 +191,6 @@ public:
         return id;
     }
 
-    // Generate OpLine for non-filename-based #line directives (ie no filename
-    // seen yet): Log the current line, and if different than the last one,
-    // issue a new OpLine using the new line and current source file name.
-    void setLine(int line);
-
-    // If filename null, generate OpLine for non-filename-based line directives,
-    // else do filename-based: Log the current line and file, and if different
-    // than the last one, issue a new OpLine using the new line and file
-    // name.
-    void setLine(int line, const char* filename);
-    // Low-level OpLine. See setLine() for a layered helper.
-    void addLine(Id fileName, int line, int column);
-    void addDebugScopeAndLine(Id fileName, int line, int column);
-
     // For creating new types (will return old type if the requested one was already made).
     Id makeVoidType();
     Id makeBoolType();
@@ -409,11 +417,16 @@ public:
     // Also reset current last DebugScope and current source line to unknown
     void setBuildPoint(Block* bp) {
         buildPoint = bp;
-        lastDebugScopeId = NoResult;
-        currentLine = 0;
+        // TODO: Technically, change of build point should set line tracker dirty. But we'll have bad line info for
+        //       branch instructions. Commenting this for now because at least this matches the old behavior.
+        dirtyScopeTracker = true;
     }
     Block* getBuildPoint() const { return buildPoint; }
 
+    // Append an instruction to the end of the current build point.
+    // Optionally, additional debug info instructions may also be prepended.
+    void addInstruction(std::unique_ptr<Instruction> inst);
+
     // Make the entry-point function. The returned pointer is only valid
     // for the lifetime of this builder.
     Function* makeEntryPoint(const char*);
@@ -430,10 +443,10 @@ public:
     void makeReturn(bool implicit, Id retVal = 0);
 
     // Initialize state and generate instructions for new lexical scope
-    void enterScope(uint32_t line);
+    void enterLexicalBlock(uint32_t line);
 
     // Set state and generate instructions to exit current lexical scope
-    void leaveScope();
+    void leaveLexicalBlock();
 
     // Prepare builder for generation of instructions for a function.
     void enterFunction(Function const* function);
@@ -882,21 +895,37 @@ public:
     unsigned int spvVersion;     // the version of SPIR-V to emit in the header
     SourceLanguage sourceLang;
     int sourceVersion;
-    spv::Id sourceFileStringId;
     spv::Id nonSemanticShaderCompilationUnitId {0};
     spv::Id nonSemanticShaderDebugInfo {0};
     spv::Id debugInfoNone {0};
     spv::Id debugExpression {0}; // Debug expression with zero operations.
     std::string sourceText;
-    int currentLine;
-    const char* currentFile;
-    spv::Id currentFileId;
+
+    // True if an new OpLine/OpDebugLine may need to be inserted. Either:
+    // 1. The current debug location changed
+    // 2. The current build point changed
+    bool dirtyLineTracker;
+    int currentLine = 0;
+    // OpString id of the current file name. Always 0 if debug info is off.
+    spv::Id currentFileId = 0;
+    // OpString id of the main file name. Always 0 if debug info is off.
+    spv::Id mainFileId = 0;
+
+    // True if an new OpDebugScope may need to be inserted. Either:
+    // 1. A new lexical block is pushed
+    // 2. The current build point changed
+    bool dirtyScopeTracker;
     std::stack<spv::Id> currentDebugScopeId;
-    spv::Id lastDebugScopeId;
-    bool emitOpLines;
-    bool emitNonSemanticShaderDebugInfo;
-    bool restoreNonSemanticShaderDebugInfo;
-    bool emitNonSemanticShaderDebugSource;
+
+    // This flag toggles tracking of debug info while building the SPIR-V.
+    bool trackDebugInfo = false;
+    // This flag toggles emission of SPIR-V debug instructions, like OpLine and OpSource.
+    bool emitSpirvDebugInfo = false;
+    // This flag toggles emission of Non-Semantic Debug extension debug instructions.
+    bool emitNonSemanticShaderDebugInfo = false;
+    bool restoreNonSemanticShaderDebugInfo = false;
+    bool emitNonSemanticShaderDebugSource = false;
+
     std::set<std::string> extensions;
     std::vector<const char*> sourceExtensions;
     std::vector<const char*> moduleProcesses;
diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h
index 8849f42e..6f3124f8 100644
--- a/SPIRV/spvIR.h
+++ b/SPIRV/spvIR.h
@@ -56,6 +56,7 @@
 #include <memory>
 #include <vector>
 #include <set>
+#include <optional>
 
 namespace spv {
 
@@ -190,6 +191,12 @@ protected:
 // SPIR-V IR block.
 //
 
+struct DebugSourceLocation {
+    int line;
+    int column;
+    spv::Id fileId;
+};
+
 class Block {
 public:
     Block(Id id, Function& parent);
@@ -200,6 +207,28 @@ public:
     Id getId() { return instructions.front()->getResultId(); }
 
     Function& getParent() const { return parent; }
+    // Returns true if the source location is actually updated.
+    // Note we still need the builder to insert the line marker instruction. This is just a tracker.
+    bool updateDebugSourceLocation(int line, int column, spv::Id fileId) {
+        if (currentSourceLoc && currentSourceLoc->line == line && currentSourceLoc->column == column &&
+            currentSourceLoc->fileId == fileId) {
+            return false;
+        }
+
+        currentSourceLoc = DebugSourceLocation{line, column, fileId};
+        return true;
+    }
+    // Returns true if the scope is actually updated.
+    // Note we still need the builder to insert the debug scope instruction. This is just a tracker.
+    bool updateDebugScope(spv::Id scopeId) {
+        assert(scopeId);
+        if (currentDebugScope && *currentDebugScope == scopeId) {
+            return false;
+        }
+
+        currentDebugScope = scopeId;
+        return true;
+    }
     void addInstruction(std::unique_ptr<Instruction> inst);
     void addPredecessor(Block* pred) { predecessors.push_back(pred); pred->successors.push_back(this);}
     void addLocalVariable(std::unique_ptr<Instruction> inst) { localVariables.push_back(std::move(inst)); }
@@ -292,6 +321,12 @@ protected:
     std::vector<std::unique_ptr<Instruction> > localVariables;
     Function& parent;
 
+    // Track source location of the last source location marker instruction.
+    std::optional<DebugSourceLocation> currentSourceLoc;
+
+    // Track scope of the last debug scope instruction.
+    std::optional<spv::Id> currentDebugScope;
+
     // track whether this block is known to be uncreachable (not necessarily
     // true for all unreachable blocks, but should be set at least
     // for the extraneous ones introduced by the builder).
diff --git a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
index 92031461..0ad36a8d 100644
--- a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
@@ -1,19 +1,19 @@
 spv.debuginfo.bufferref.glsl.frag
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 143
+// Id's are bound by 142
 
                               Capability Shader
                               Capability PhysicalStorageBufferAddressesEXT
                               Extension  "SPV_KHR_non_semantic_info"
                               Extension  "SPV_KHR_physical_storage_buffer"
                               Extension  "SPV_KHR_storage_buffer_storage_class"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel PhysicalStorageBuffer64EXT GLSL450
-                              EntryPoint Fragment 14  "main" 75 134
+                              EntryPoint Fragment 14  "main" 76 131
                               ExecutionMode 14 OriginUpperLeft
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               16:             String  "main"
               19:             String  "// OpModuleProcessed auto-map-locations
@@ -24,45 +24,45 @@ spv.debuginfo.bufferref.glsl.frag
 // OpModuleProcessed entry-point main
 #line 1
 "
-              32:             String  "Mesh"
+              31:             String  "Mesh"
               34:             String  "float"
               40:             String  "data"
               44:             String  "MeshVertexPositions"
               50:             String  "meshData"
-              62:             String  "PerPass_meshes"
-              68:             String  "perPass_meshes"
-              70:             String  "int"
-              77:             String  "tri_idx0"
-              95:             String  "vertex_pos0"
-             136:             String  "out_fragColor"
+              63:             String  "PerPass_meshes"
+              69:             String  "perPass_meshes"
+              71:             String  "int"
+              78:             String  "tri_idx0"
+              94:             String  "vertex_pos0"
+             133:             String  "out_fragColor"
                               SourceExtension  "GL_EXT_buffer_reference"
                               Name 14  "main"
-                              Name 30  "Mesh"
-                              MemberName 30(Mesh) 0  "positions"
+                              Name 29  "Mesh"
+                              MemberName 29(Mesh) 0  "positions"
                               Name 38  "MeshVertexPositions"
                               MemberName 38(MeshVertexPositions) 0  "data"
                               Name 48  "meshData"
-                              Name 53  "Mesh"
-                              MemberName 53(Mesh) 0  "positions"
-                              Name 57  "PerPass_meshes"
-                              MemberName 57(PerPass_meshes) 0  "data"
-                              Name 66  "perPass_meshes"
-                              Name 75  "tri_idx0"
-                              Name 93  "vertex_pos0"
-                              Name 134  "out_fragColor"
+                              Name 54  "Mesh"
+                              MemberName 54(Mesh) 0  "positions"
+                              Name 58  "PerPass_meshes"
+                              MemberName 58(PerPass_meshes) 0  "data"
+                              Name 67  "perPass_meshes"
+                              Name 76  "tri_idx0"
+                              Name 92  "vertex_pos0"
+                              Name 131  "out_fragColor"
                               Decorate 36 ArrayStride 4
                               MemberDecorate 38(MeshVertexPositions) 0 Offset 0
                               Decorate 38(MeshVertexPositions) Block
-                              MemberDecorate 53(Mesh) 0 Offset 0
-                              Decorate 55 ArrayStride 8
-                              MemberDecorate 57(PerPass_meshes) 0 NonWritable
-                              MemberDecorate 57(PerPass_meshes) 0 Offset 0
-                              Decorate 57(PerPass_meshes) Block
-                              Decorate 66(perPass_meshes) DescriptorSet 0
-                              Decorate 66(perPass_meshes) Binding 0
-                              Decorate 75(tri_idx0) Flat
-                              Decorate 75(tri_idx0) Location 0
-                              Decorate 134(out_fragColor) Location 0
+                              MemberDecorate 54(Mesh) 0 Offset 0
+                              Decorate 56 ArrayStride 8
+                              MemberDecorate 58(PerPass_meshes) 0 NonWritable
+                              MemberDecorate 58(PerPass_meshes) 0 Offset 0
+                              Decorate 58(PerPass_meshes) Block
+                              Decorate 67(perPass_meshes) DescriptorSet 0
+                              Decorate 67(perPass_meshes) Binding 0
+                              Decorate 76(tri_idx0) Flat
+                              Decorate 76(tri_idx0) Location 0
+                              Decorate 131(out_fragColor) Location 0
                               Decorate 48(meshData) DecorationAliasedPointerEXT
                4:             TypeVoid
                5:             TypeFunction 4
@@ -70,129 +70,127 @@ spv.debuginfo.bufferref.glsl.frag
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 19
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               20:      7(int) Constant 20
               22:      7(int) Constant 1
               23:      7(int) Constant 4
               24:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
-              17:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
-              28:      7(int) Constant 21
-                              TypeForwardPointer 29 PhysicalStorageBufferEXT
-        30(Mesh):             TypeStruct 29
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 32 22 18 28 12 21 32 12 13
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
+              17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
+                              TypeForwardPointer 28 PhysicalStorageBufferEXT
+        29(Mesh):             TypeStruct 28
+              32:      7(int) Constant 21
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 31 22 18 32 12 21 31 12 13
               33:             TypeFloat 32
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 34 10 13 12
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 34 10 13 12
               36:             TypeRuntimeArray 33(float)
-              37:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 35 12
+              37:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 35 12
 38(MeshVertexPositions):             TypeStruct 36
               41:      7(int) Constant 5
               42:      7(int) Constant 9
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 40 37 18 41 42 12 12 13
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 44 22 18 28 12 21 44 12 13 39
-              29:             TypePointer PhysicalStorageBufferEXT 38(MeshVertexPositions)
-              45:             TypePointer Function 30(Mesh)
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 40 37 18 41 42 12 12 13
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 44 22 18 32 12 21 44 12 13 39
+              28:             TypePointer PhysicalStorageBufferEXT 38(MeshVertexPositions)
+              45:             TypePointer Function 29(Mesh)
               46:      7(int) Constant 7
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 46 12
-              49:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 50 31 18 28 12 17 23
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-        53(Mesh):             TypeStruct 29(ptr)
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 32 22 18 28 12 21 32 12 13
-              55:             TypeRuntimeArray 53(Mesh)
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 54 12
-57(PerPass_meshes):             TypeStruct 55
-              59:      7(int) Constant 13
-              60:      7(int) Constant 8
-              58:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 40 56 18 59 60 12 12 13
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 62 22 18 28 12 21 62 12 13 58
-              63:             TypePointer StorageBuffer 57(PerPass_meshes)
-              64:      7(int) Constant 12
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 64 12
-66(perPass_meshes):     63(ptr) Variable StorageBuffer
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 68 61 18 28 12 21 68 66(perPass_meshes) 60
-              69:             TypeInt 32 1
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 70 10 23 12
-              72:     69(int) Constant 0
-              73:             TypePointer Input 7(int)
-              74:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 22 12
-    75(tri_idx0):     73(ptr) Variable Input
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 77 9 18 28 12 21 77 75(tri_idx0) 60
-              79:             TypePointer StorageBuffer 53(Mesh)
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 54 64 12
-              84:             TypePointer Function 29(ptr)
-              85:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-              88:      7(int) Constant 23
-              89:             TypeVector 33(float) 3
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 35 13
-              91:             TypePointer Function 89(fvec3)
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 90 46 12
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 95 90 18 88 12 17 23
-              98:      7(int) Constant 25
-             104:             TypePointer PhysicalStorageBufferEXT 33(float)
-             105:      7(int) Constant 5349
-             106:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 35 105 12
-             110:      7(int) Constant 24
-             129:      7(int) Constant 27
-             130:             TypeVector 33(float) 4
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 35 23
-             132:             TypePointer Output 130(fvec4)
-             133:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 131 13 12
-134(out_fragColor):    132(ptr) Variable Output
-             135:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 136 131 18 129 12 21 136 134(out_fragColor) 60
-             138:   33(float) Constant 1065353216
-                              Line 1 20 11
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 46 12
+              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 50 30 18 32 12 17 23
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+        54(Mesh):             TypeStruct 28(ptr)
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 31 22 18 32 12 21 31 12 13
+              56:             TypeRuntimeArray 54(Mesh)
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 55 12
+58(PerPass_meshes):             TypeStruct 56
+              60:      7(int) Constant 13
+              61:      7(int) Constant 8
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 40 57 18 60 61 12 12 13
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 63 22 18 32 12 21 63 12 13 59
+              64:             TypePointer StorageBuffer 58(PerPass_meshes)
+              65:      7(int) Constant 12
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 62 65 12
+67(perPass_meshes):     64(ptr) Variable StorageBuffer
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 69 62 18 32 12 21 69 67(perPass_meshes) 61
+              70:             TypeInt 32 1
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 71 10 23 12
+              73:     70(int) Constant 0
+              74:             TypePointer Input 7(int)
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 22 12
+    76(tri_idx0):     74(ptr) Variable Input
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 78 9 18 32 12 21 78 76(tri_idx0) 61
+              80:             TypePointer StorageBuffer 54(Mesh)
+              81:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 55 65 12
+              85:             TypePointer Function 28(ptr)
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+              88:             TypeVector 33(float) 3
+              89:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 35 13
+              90:             TypePointer Function 88(fvec3)
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 89 46 12
+              95:      7(int) Constant 23
+              93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 94 89 18 95 12 17 23
+             102:             TypePointer PhysicalStorageBufferEXT 33(float)
+             103:      7(int) Constant 5349
+             104:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 35 103 12
+             109:      7(int) Constant 24
+             118:      7(int) Constant 25
+             127:             TypeVector 33(float) 4
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 35 23
+             129:             TypePointer Output 127(fvec4)
+             130:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 128 13 12
+131(out_fragColor):    129(ptr) Variable Output
+             134:      7(int) Constant 27
+             132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 133 128 18 134 12 21 133 131(out_fragColor) 61
+             137:   33(float) Constant 1065353216
         14(main):           4 Function None 5
               15:             Label
     48(meshData):     45(ptr) Variable Function
- 93(vertex_pos0):     91(ptr) Variable Function
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 49 48(meshData) 52
-              78:      7(int) Load 75(tri_idx0)
-              81:     79(ptr) AccessChain 66(perPass_meshes) 72 78
-              82:    53(Mesh) Load 81
-              83:     29(ptr) CompositeExtract 82 0
-              86:     84(ptr) AccessChain 48(meshData) 72
-                              Store 86 83
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 88 88 12 12
-              96:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 94 93(vertex_pos0) 52
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 98 98 12 12
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 88 88 12 12
-             100:     84(ptr) AccessChain 48(meshData) 72
-             101:     29(ptr) Load 100
-             102:      7(int) Load 75(tri_idx0)
-             103:      7(int) IMul 13 102
-             107:    104(ptr) AccessChain 101 72 103
-             108:   33(float) Load 107 Aligned 4
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 110 110 12 12
-             111:     84(ptr) AccessChain 48(meshData) 72
-             112:     29(ptr) Load 111
-             113:      7(int) Load 75(tri_idx0)
-             114:      7(int) IMul 13 113
-             115:      7(int) IAdd 114 22
-             116:    104(ptr) AccessChain 112 72 115
-             117:   33(float) Load 116 Aligned 4
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 98 98 12 12
-             119:     84(ptr) AccessChain 48(meshData) 72
-             120:     29(ptr) Load 119
-             121:      7(int) Load 75(tri_idx0)
-             122:      7(int) IMul 13 121
-             123:      7(int) IAdd 122 24
-             124:    104(ptr) AccessChain 120 72 123
-             125:   33(float) Load 124 Aligned 4
-             126:   89(fvec3) CompositeConstruct 108 117 125
-             127:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 88 88 12 12
-                              Store 93(vertex_pos0) 126
-             128:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 129 129 12 12
-             137:   89(fvec3) Load 93(vertex_pos0)
-             139:   33(float) CompositeExtract 137 0
-             140:   33(float) CompositeExtract 137 1
-             141:   33(float) CompositeExtract 137 2
-             142:  130(fvec4) CompositeConstruct 139 140 141 138
-                              Store 134(out_fragColor) 142
+ 92(vertex_pos0):     90(ptr) Variable Function
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 32 32 12 12
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 49 48(meshData) 52
+              79:      7(int) Load 76(tri_idx0)
+              82:     80(ptr) AccessChain 67(perPass_meshes) 73 79
+              83:    54(Mesh) Load 82
+              84:     28(ptr) CompositeExtract 83 0
+              87:     85(ptr) AccessChain 48(meshData) 73
+                              Store 87 84
+              97:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 95 95 12 12
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 93 92(vertex_pos0) 52
+              98:     85(ptr) AccessChain 48(meshData) 73
+              99:     28(ptr) Load 98
+             100:      7(int) Load 76(tri_idx0)
+             101:      7(int) IMul 13 100
+             105:    102(ptr) AccessChain 99 73 101
+             106:   33(float) Load 105 Aligned 4
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 109 109 12 12
+             107:     85(ptr) AccessChain 48(meshData) 73
+             110:     28(ptr) Load 107
+             111:      7(int) Load 76(tri_idx0)
+             112:      7(int) IMul 13 111
+             113:      7(int) IAdd 112 22
+             114:    102(ptr) AccessChain 110 73 113
+             115:   33(float) Load 114 Aligned 4
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 118 118 12 12
+             116:     85(ptr) AccessChain 48(meshData) 73
+             119:     28(ptr) Load 116
+             120:      7(int) Load 76(tri_idx0)
+             121:      7(int) IMul 13 120
+             122:      7(int) IAdd 121 24
+             123:    102(ptr) AccessChain 119 73 122
+             124:   33(float) Load 123 Aligned 4
+             125:   88(fvec3) CompositeConstruct 106 115 124
+             126:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 95 95 12 12
+                              Store 92(vertex_pos0) 125
+             136:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 134 134 12 12
+             135:   88(fvec3) Load 92(vertex_pos0)
+             138:   33(float) CompositeExtract 135 0
+             139:   33(float) CompositeExtract 135 1
+             140:   33(float) CompositeExtract 135 2
+             141:  127(fvec4) CompositeConstruct 138 139 140 137
+                              Store 131(out_fragColor) 141
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out b/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
index 398fd86d..6d0b52fb 100644
--- a/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
@@ -1,16 +1,16 @@
 spv.debuginfo.const_params.glsl.comp
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 70
+// Id's are bound by 71
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint GLCompute 14  "main"
                               ExecutionMode 14 LocalSize 1 1 1
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               17:             String  "float"
               35:             String  "function"
@@ -22,7 +22,7 @@ spv.debuginfo.const_params.glsl.comp
 // OpModuleProcessed entry-point main
 #line 1
 "
-              45:             String  "f"
+              43:             String  "f"
               49:             String  "f2"
               52:             String  "f3"
               55:             String  "f4"
@@ -39,60 +39,59 @@ spv.debuginfo.const_params.glsl.comp
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
               16:             TypeFloat 32
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
               19:             TypeVector 16(float) 2
               20:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
               22:             TypeVector 16(float) 3
-              23:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
+              23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
               24:             TypeVector 16(float) 4
               25:      7(int) Constant 4
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 25
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 25
               27:             TypeFunction 4 16(float) 19(fvec2) 22(fvec3) 24(fvec4)
-              28:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4 18 21 23 26
-              37:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 38
+              28:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4 18 21 23 26
+              37:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 38
               39:      7(int) Constant 7
               41:      7(int) Constant 1
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 41 25 37 20
-              36:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 35 28 37 39 12 40 35 13 39
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 45 18 37 39 12 36 25 41
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 21 37 39 12 36 25 20
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 23 37 39 12 36 25 13
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 55 26 37 39 12 36 25 25
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 41 25 37 20
+              36:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 35 28 37 39 12 40 35 13 39
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 43 18 37 39 12 36 25 41
+              45:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 21 37 39 12 36 25 20
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 23 37 39 12 36 25 13
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 55 26 37 39 12 36 25 25
               59:      7(int) Constant 11
-              58:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 57 6 37 59 12 40 57 13 59
-              64:      7(int) Constant 13
-              65:   16(float) Constant 0
-              66:   19(fvec2) ConstantComposite 65 65
-              67:   22(fvec3) ConstantComposite 65 65 65
-              68:   24(fvec4) ConstantComposite 65 65 65 65
-                              Line 1 11 11
+              58:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 57 6 37 59 12 40 57 13 59
+              64:   16(float) Constant 0
+              65:   19(fvec2) ConstantComposite 64 64
+              66:   22(fvec3) ConstantComposite 64 64 64
+              67:   24(fvec4) ConstantComposite 64 64 64 64
+              70:      7(int) Constant 13
         14(main):           4 Function None 5
               15:             Label
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 58 14(main)
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 58
-              63:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 37 64 64 12 12
-              69:           4 FunctionCall 33(function(f1;vf2;vf3;vf4;) 65 66 67 68
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 58
+              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 37 59 59 12 12
+              61:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 58 14(main)
+              69:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 37 70 70 12 12
+              68:           4 FunctionCall 33(function(f1;vf2;vf3;vf4;) 64 65 66 67
                               Return
                               FunctionEnd
-                              Line 1 7 18
 33(function(f1;vf2;vf3;vf4;):           4 Function None 27
            29(f):   16(float) FunctionParameter
           30(f2):   19(fvec2) FunctionParameter
           31(f3):   22(fvec3) FunctionParameter
           32(f4):   24(fvec4) FunctionParameter
               34:             Label
-              42:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 36
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 37 39 39 12 12
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 44 29(f) 47
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 48 30(f2) 47
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 51 31(f3) 47
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 54 32(f4) 47
-              60:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 36 33(function(f1;vf2;vf3;vf4;)
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 36
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 37 39 39 12 12
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 42 29(f) 45
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 48 30(f2) 45
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 51 31(f3) 45
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 29(DebugValue) 54 32(f4) 45
+              60:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 36 33(function(f1;vf2;vf3;vf4;)
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.comp.out b/Test/baseResults/spv.debuginfo.glsl.comp.out
index 962c99f4..b8cb662e 100644
--- a/Test/baseResults/spv.debuginfo.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.glsl.comp.out
@@ -1,16 +1,17 @@
 spv.debuginfo.glsl.comp
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 964
+// Id's are bound by 974
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint GLCompute 14  "main" 132
+                              EntryPoint GLCompute 14  "main" 133
                               ExecutionMode 14 LocalSize 10 10 1
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               17:             String  "float"
               33:             String  "springForce"
@@ -22,1197 +23,1202 @@ spv.debuginfo.glsl.comp
 // OpModuleProcessed entry-point main
 #line 1
 "
-              45:             String  "p0"
+              43:             String  "p0"
               49:             String  "p1"
               52:             String  "restDist"
               54:             String  "main"
-              63:             String  "dist"
-              75:             String  "int"
-              81:             String  "sphereRadius"
-              92:             String  "gravity"
-              96:             String  "particleCount"
-              99:             String  "UBO"
-             104:             String  "params"
-             128:             String  "id"
-             134:             String  "gl_GlobalInvocationID"
-             142:             String  "index"
-             166:             String  "bool"
-             180:             String  "normal"
-             186:             String  "pinned"
-             188:             String  "Particle"
+              60:             String  "dist"
+              74:             String  "int"
+              80:             String  "sphereRadius"
+              91:             String  "gravity"
+              95:             String  "particleCount"
+              98:             String  "UBO"
+             103:             String  "params"
+             127:             String  "id"
+             135:             String  "gl_GlobalInvocationID"
+             141:             String  "index"
+             167:             String  "bool"
+             179:             String  "normal"
+             185:             String  "pinned"
+             187:             String  "Particle"
              193:             String  "particleIn"
              197:             String  "ParticleIn"
-             218:             String  "particleOut"
-             221:             String  "ParticleOut"
+             217:             String  "particleOut"
+             220:             String  "ParticleOut"
              248:             String  "force"
-             261:             String  "pos"
-             271:             String  "vel"
-             571:             String  "f"
-             620:             String  "sphereDist"
-             672:             String  "calculateNormals"
-             675:             String  "PushConsts"
-             681:             String  "pushConsts"
-             716:             String  "a"
-             729:             String  "b"
-             746:             String  "c"
+             262:             String  "pos"
+             272:             String  "vel"
+             576:             String  "f"
+             625:             String  "sphereDist"
+             676:             String  "calculateNormals"
+             679:             String  "PushConsts"
+             686:             String  "pushConsts"
+             720:             String  "a"
+             734:             String  "b"
+             751:             String  "c"
                               Name 14  "main"
                               Name 31  "springForce(vf3;vf3;f1;"
                               Name 28  "p0"
                               Name 29  "p1"
                               Name 30  "restDist"
-                              Name 61  "dist"
-                              Name 79  "UBO"
-                              MemberName 79(UBO) 0  "deltaT"
-                              MemberName 79(UBO) 1  "particleMass"
-                              MemberName 79(UBO) 2  "springStiffness"
-                              MemberName 79(UBO) 3  "damping"
-                              MemberName 79(UBO) 4  "restDistH"
-                              MemberName 79(UBO) 5  "restDistV"
-                              MemberName 79(UBO) 6  "restDistD"
-                              MemberName 79(UBO) 7  "sphereRadius"
-                              MemberName 79(UBO) 8  "spherePos"
-                              MemberName 79(UBO) 9  "gravity"
-                              MemberName 79(UBO) 10  "particleCount"
-                              Name 102  "params"
-                              Name 126  "id"
-                              Name 132  "gl_GlobalInvocationID"
-                              Name 140  "index"
-                              Name 178  "Particle"
-                              MemberName 178(Particle) 0  "pos"
-                              MemberName 178(Particle) 1  "vel"
-                              MemberName 178(Particle) 2  "uv"
-                              MemberName 178(Particle) 3  "normal"
-                              MemberName 178(Particle) 4  "pinned"
+                              Name 58  "dist"
+                              Name 78  "UBO"
+                              MemberName 78(UBO) 0  "deltaT"
+                              MemberName 78(UBO) 1  "particleMass"
+                              MemberName 78(UBO) 2  "springStiffness"
+                              MemberName 78(UBO) 3  "damping"
+                              MemberName 78(UBO) 4  "restDistH"
+                              MemberName 78(UBO) 5  "restDistV"
+                              MemberName 78(UBO) 6  "restDistD"
+                              MemberName 78(UBO) 7  "sphereRadius"
+                              MemberName 78(UBO) 8  "spherePos"
+                              MemberName 78(UBO) 9  "gravity"
+                              MemberName 78(UBO) 10  "particleCount"
+                              Name 101  "params"
+                              Name 125  "id"
+                              Name 133  "gl_GlobalInvocationID"
+                              Name 139  "index"
+                              Name 177  "Particle"
+                              MemberName 177(Particle) 0  "pos"
+                              MemberName 177(Particle) 1  "vel"
+                              MemberName 177(Particle) 2  "uv"
+                              MemberName 177(Particle) 3  "normal"
+                              MemberName 177(Particle) 4  "pinned"
                               Name 191  "ParticleIn"
                               MemberName 191(ParticleIn) 0  "particleIn"
                               Name 200  ""
-                              Name 216  "ParticleOut"
-                              MemberName 216(ParticleOut) 0  "particleOut"
+                              Name 215  "ParticleOut"
+                              MemberName 215(ParticleOut) 0  "particleOut"
                               Name 224  ""
                               Name 246  "force"
-                              Name 259  "pos"
-                              Name 269  "vel"
-                              Name 289  "param"
-                              Name 293  "param"
-                              Name 295  "param"
-                              Name 318  "param"
-                              Name 322  "param"
-                              Name 324  "param"
-                              Name 351  "param"
-                              Name 355  "param"
-                              Name 357  "param"
-                              Name 379  "param"
-                              Name 383  "param"
-                              Name 385  "param"
-                              Name 421  "param"
+                              Name 260  "pos"
+                              Name 270  "vel"
+                              Name 292  "param"
+                              Name 296  "param"
+                              Name 298  "param"
+                              Name 321  "param"
+                              Name 325  "param"
+                              Name 327  "param"
+                              Name 354  "param"
+                              Name 358  "param"
+                              Name 360  "param"
+                              Name 382  "param"
+                              Name 386  "param"
+                              Name 388  "param"
                               Name 425  "param"
-                              Name 427  "param"
-                              Name 458  "param"
-                              Name 462  "param"
-                              Name 464  "param"
-                              Name 503  "param"
-                              Name 507  "param"
+                              Name 429  "param"
+                              Name 431  "param"
+                              Name 463  "param"
+                              Name 467  "param"
+                              Name 469  "param"
                               Name 509  "param"
-                              Name 544  "param"
-                              Name 548  "param"
-                              Name 550  "param"
-                              Name 569  "f"
-                              Name 618  "sphereDist"
-                              Name 670  "PushConsts"
-                              MemberName 670(PushConsts) 0  "calculateNormals"
-                              Name 679  "pushConsts"
-                              Name 692  "normal"
-                              Name 714  "a"
-                              Name 727  "b"
-                              Name 744  "c"
-                              MemberDecorate 79(UBO) 0 Offset 0
-                              MemberDecorate 79(UBO) 1 Offset 4
-                              MemberDecorate 79(UBO) 2 Offset 8
-                              MemberDecorate 79(UBO) 3 Offset 12
-                              MemberDecorate 79(UBO) 4 Offset 16
-                              MemberDecorate 79(UBO) 5 Offset 20
-                              MemberDecorate 79(UBO) 6 Offset 24
-                              MemberDecorate 79(UBO) 7 Offset 28
-                              MemberDecorate 79(UBO) 8 Offset 32
-                              MemberDecorate 79(UBO) 9 Offset 48
-                              MemberDecorate 79(UBO) 10 Offset 64
-                              Decorate 79(UBO) Block
-                              Decorate 102(params) DescriptorSet 0
-                              Decorate 102(params) Binding 2
-                              Decorate 132(gl_GlobalInvocationID) BuiltIn GlobalInvocationId
-                              MemberDecorate 178(Particle) 0 Offset 0
-                              MemberDecorate 178(Particle) 1 Offset 16
-                              MemberDecorate 178(Particle) 2 Offset 32
-                              MemberDecorate 178(Particle) 3 Offset 48
-                              MemberDecorate 178(Particle) 4 Offset 64
+                              Name 513  "param"
+                              Name 515  "param"
+                              Name 551  "param"
+                              Name 555  "param"
+                              Name 557  "param"
+                              Name 574  "f"
+                              Name 623  "sphereDist"
+                              Name 674  "PushConsts"
+                              MemberName 674(PushConsts) 0  "calculateNormals"
+                              Name 684  "pushConsts"
+                              Name 696  "normal"
+                              Name 718  "a"
+                              Name 732  "b"
+                              Name 749  "c"
+                              MemberDecorate 78(UBO) 0 Offset 0
+                              MemberDecorate 78(UBO) 1 Offset 4
+                              MemberDecorate 78(UBO) 2 Offset 8
+                              MemberDecorate 78(UBO) 3 Offset 12
+                              MemberDecorate 78(UBO) 4 Offset 16
+                              MemberDecorate 78(UBO) 5 Offset 20
+                              MemberDecorate 78(UBO) 6 Offset 24
+                              MemberDecorate 78(UBO) 7 Offset 28
+                              MemberDecorate 78(UBO) 8 Offset 32
+                              MemberDecorate 78(UBO) 9 Offset 48
+                              MemberDecorate 78(UBO) 10 Offset 64
+                              Decorate 78(UBO) Block
+                              Decorate 101(params) DescriptorSet 0
+                              Decorate 101(params) Binding 2
+                              Decorate 133(gl_GlobalInvocationID) BuiltIn GlobalInvocationId
+                              MemberDecorate 177(Particle) 0 Offset 0
+                              MemberDecorate 177(Particle) 1 Offset 16
+                              MemberDecorate 177(Particle) 2 Offset 32
+                              MemberDecorate 177(Particle) 3 Offset 48
+                              MemberDecorate 177(Particle) 4 Offset 64
                               Decorate 189 ArrayStride 80
                               MemberDecorate 191(ParticleIn) 0 Offset 0
                               Decorate 191(ParticleIn) BufferBlock
                               Decorate 200 DescriptorSet 0
                               Decorate 200 Binding 0
-                              Decorate 214 ArrayStride 80
-                              MemberDecorate 216(ParticleOut) 0 Offset 0
-                              Decorate 216(ParticleOut) BufferBlock
+                              Decorate 213 ArrayStride 80
+                              MemberDecorate 215(ParticleOut) 0 Offset 0
+                              Decorate 215(ParticleOut) BufferBlock
                               Decorate 224 DescriptorSet 0
                               Decorate 224 Binding 1
-                              MemberDecorate 670(PushConsts) 0 Offset 0
-                              Decorate 670(PushConsts) Block
-                              Decorate 963 BuiltIn WorkgroupSize
+                              MemberDecorate 674(PushConsts) 0 Offset 0
+                              Decorate 674(PushConsts) Block
+                              Decorate 973 BuiltIn WorkgroupSize
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
               16:             TypeFloat 32
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
               19:             TypeVector 16(float) 3
-              20:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
+              20:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
               21:             TypePointer Function 19(fvec3)
               22:      7(int) Constant 7
-              23:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 12
+              23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 12
               24:             TypePointer Function 16(float)
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 22 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 22 12
               26:             TypeFunction 19(fvec3) 21(ptr) 21(ptr) 24(ptr)
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 20 20 20 18
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 36
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 20 20 20 18
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 36
               37:      7(int) Constant 66
               39:      7(int) Constant 1
               40:      7(int) Constant 4
               41:      7(int) Constant 2
-              38:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 39 40 35 41
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 33 27 35 37 12 38 33 13 37
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 45 20 35 37 12 34 40 39
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 20 35 37 12 34 40 41
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 18 35 37 12 34 40 13
+              38:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 39 40 35 41
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 33 27 35 37 12 38 33 13 37
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 43 20 35 37 12 34 40 39
+              45:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 20 35 37 12 34 40 41
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 18 35 37 12 34 40 13
               56:      7(int) Constant 72
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 54 6 35 56 12 38 54 13 56
-              60:      7(int) Constant 68
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 63 20 35 60 12 34 40
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 54 6 35 56 12 38 54 13 56
+              61:      7(int) Constant 68
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 60 20 35 61 12 34 40
               69:      7(int) Constant 69
-              72:             TypeVector 16(float) 4
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 40
-              74:             TypeInt 32 1
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 75 10 40 12
-              77:             TypeVector 74(int) 2
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 76 41
-         79(UBO):             TypeStruct 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 72(fvec4) 72(fvec4) 77(ivec2)
-              82:      7(int) Constant 56
-              83:      7(int) Constant 8
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              84:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              85:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 18 35 82 83 12 12 13
-              93:      7(int) Constant 58
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 92 73 35 93 22 12 12 13
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 92 73 35 93 22 12 12 13
-              97:      7(int) Constant 59
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 96 78 35 97 83 12 12 13
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 99 39 35 69 12 38 99 12 13 80 84 85 86 87 88 89 90 91 94 95
-             100:             TypePointer Uniform 79(UBO)
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 41 12
-     102(params):    100(ptr) Variable Uniform
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 104 98 35 69 12 38 104 102(params) 83
-             105:     74(int) Constant 2
-             106:             TypePointer Uniform 16(float)
-             107:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 41 12
-             121:      7(int) Constant 74
-             122:             TypeVector 7(int) 3
-             123:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 9 13
-             124:             TypePointer Function 122(ivec3)
-             125:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 123 22 12
-             127:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 128 123 35 121 12 55 40
-             130:             TypePointer Input 122(ivec3)
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 123 39 12
-132(gl_GlobalInvocationID):    130(ptr) Variable Input
-             133:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 134 123 35 121 12 38 134 132(gl_GlobalInvocationID) 83
-             137:      7(int) Constant 76
-             138:             TypePointer Function 7(int)
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 22 12
-             141:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 142 9 35 137 12 55 40
-             146:     74(int) Constant 10
-             147:             TypePointer Uniform 74(int)
-             148:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 76 41 12
-             157:      7(int) Constant 77
-             165:             TypeBool
-             167:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 166 10 41 12
-             173:      7(int) Constant 78
-             177:      7(int) Constant 81
-   178(Particle):             TypeStruct 72(fvec4) 72(fvec4) 72(fvec4) 72(fvec4) 16(float)
-             181:      7(int) Constant 31
-             179:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 180 73 35 181 22 12 12 13
-             182:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 180 73 35 181 22 12 12 13
-             183:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 180 73 35 181 22 12 12 13
-             184:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 180 73 35 181 22 12 12 13
-             185:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 186 18 35 10 83 12 12 13
-             187:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 188 39 35 177 12 38 188 12 13 179 182 183 184 185
-             189:             TypeRuntimeArray 178(Particle)
-             190:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 187 12
+              71:             TypeVector 16(float) 4
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 40
+              73:             TypeInt 32 1
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 74 10 40 12
+              76:             TypeVector 73(int) 2
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 75 41
+         78(UBO):             TypeStruct 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 16(float) 71(fvec4) 71(fvec4) 76(ivec2)
+              81:      7(int) Constant 56
+              82:      7(int) Constant 8
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              83:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              84:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              87:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              89:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 18 35 81 82 12 12 13
+              92:      7(int) Constant 58
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 91 72 35 92 22 12 12 13
+              93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 91 72 35 92 22 12 12 13
+              96:      7(int) Constant 59
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 77 35 96 82 12 12 13
+              97:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 98 39 35 69 12 38 98 12 13 79 83 84 85 86 87 88 89 90 93 94
+              99:             TypePointer Uniform 78(UBO)
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 97 41 12
+     101(params):     99(ptr) Variable Uniform
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 103 97 35 69 12 38 103 101(params) 82
+             104:     73(int) Constant 2
+             105:             TypePointer Uniform 16(float)
+             106:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 41 12
+             121:             TypeVector 7(int) 3
+             122:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 9 13
+             123:             TypePointer Function 121(ivec3)
+             124:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 122 22 12
+             128:      7(int) Constant 74
+             126:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 127 122 35 128 12 55 40
+             131:             TypePointer Input 121(ivec3)
+             132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 122 39 12
+133(gl_GlobalInvocationID):    131(ptr) Variable Input
+             134:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 135 122 35 128 12 38 135 133(gl_GlobalInvocationID) 82
+             137:             TypePointer Function 7(int)
+             138:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 22 12
+             142:      7(int) Constant 76
+             140:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 141 9 35 142 12 55 40
+             147:     73(int) Constant 10
+             148:             TypePointer Uniform 73(int)
+             149:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 75 41 12
+             159:      7(int) Constant 77
+             166:             TypeBool
+             168:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 167 10 41 12
+             174:      7(int) Constant 78
+   177(Particle):             TypeStruct 71(fvec4) 71(fvec4) 71(fvec4) 71(fvec4) 16(float)
+             180:      7(int) Constant 31
+             178:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 179 72 35 180 22 12 12 13
+             181:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 179 72 35 180 22 12 12 13
+             182:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 179 72 35 180 22 12 12 13
+             183:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 179 72 35 180 22 12 12 13
+             184:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 185 18 35 10 82 12 12 13
+             188:      7(int) Constant 81
+             186:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 187 39 35 188 12 38 187 12 13 178 181 182 183 184
+             189:             TypeRuntimeArray 177(Particle)
+             190:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 186 12
  191(ParticleIn):             TypeStruct 189
              194:      7(int) Constant 36
              195:      7(int) Constant 11
-             192:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 193 190 35 194 195 12 12 13
-             196:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 197 39 35 177 12 38 197 12 13 192
+             192:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 193 190 35 194 195 12 12 13
+             196:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 197 39 35 188 12 38 197 12 13 192
              198:             TypePointer Uniform 191(ParticleIn)
-             199:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 196 41 12
+             199:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 196 41 12
              200:    198(ptr) Variable Uniform
-             201:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 196 35 177 12 38 1 200 83
-             202:     74(int) Constant 0
-             204:     74(int) Constant 4
-             207:   16(float) Constant 1065353216
-             213:      7(int) Constant 82
-             214:             TypeRuntimeArray 178(Particle)
-             215:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 187 12
-216(ParticleOut):             TypeStruct 214
-             219:      7(int) Constant 40
-             217:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 218 215 35 219 195 12 12 13
-             220:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 221 39 35 213 12 38 221 12 13 217
-             222:             TypePointer Uniform 216(ParticleOut)
-             223:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 220 41 12
+             201:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 196 35 188 12 38 2 200 82
+             202:     73(int) Constant 0
+             206:     73(int) Constant 4
+             209:   16(float) Constant 1065353216
+             213:             TypeRuntimeArray 177(Particle)
+             214:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 186 12
+215(ParticleOut):             TypeStruct 213
+             218:      7(int) Constant 40
+             216:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 217 214 35 218 195 12 12 13
+             221:      7(int) Constant 82
+             219:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 220 39 35 221 12 38 220 12 13 216
+             222:             TypePointer Uniform 215(ParticleOut)
+             223:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 219 41 12
              224:    222(ptr) Variable Uniform
-             225:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 220 35 213 12 38 1 224 83
-             228:             TypePointer Uniform 72(fvec4)
-             229:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 73 41 12
-             234:      7(int) Constant 83
-             236:     74(int) Constant 1
-             237:   16(float) Constant 0
-             238:   72(fvec4) ConstantComposite 237 237 237 237
-             241:      7(int) Constant 84
-             245:      7(int) Constant 88
-             247:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 248 20 35 245 12 55 40
-             250:     74(int) Constant 9
-             258:      7(int) Constant 90
-             260:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 261 20 35 258 12 55 40
-             268:      7(int) Constant 91
-             270:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 271 20 35 268 12 55 40
-             278:      7(int) Constant 95
-             286:      7(int) Constant 96
-             303:      7(int) Constant 99
-             315:      7(int) Constant 100
-             332:      7(int) Constant 103
-             344:      7(int) Constant 104
-             350:     74(int) Constant 5
-             365:      7(int) Constant 107
-             373:      7(int) Constant 108
-             393:      7(int) Constant 111
-             413:      7(int) Constant 112
-             420:     74(int) Constant 6
-             435:      7(int) Constant 115
-             451:      7(int) Constant 116
-             472:      7(int) Constant 119
-             496:      7(int) Constant 120
-             517:      7(int) Constant 123
-             537:      7(int) Constant 124
-             558:      7(int) Constant 127
-             559:     74(int) Constant 3
-             568:      7(int) Constant 130
-             570:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 571 20 35 568 12 55 40
-             579:      7(int) Constant 131
-             587:   16(float) Constant 1056964608
-             603:      7(int) Constant 132
-             617:      7(int) Constant 135
-             619:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 620 20 35 617 12 55 40
-             626:     74(int) Constant 8
-             632:      7(int) Constant 136
-             635:     74(int) Constant 7
-             638:   16(float) Constant 1008981770
-             645:      7(int) Constant 138
-             664:      7(int) Constant 140
-             669:      7(int) Constant 144
- 670(PushConsts):             TypeStruct 7(int)
-             673:      7(int) Constant 63
-             671:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 672 9 35 673 22 12 12 13
-             674:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 675 39 35 669 12 38 675 12 13 671
-             676:             TypePointer PushConstant 670(PushConsts)
-             677:      7(int) Constant 9
-             678:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 674 677 12
- 679(pushConsts):    676(ptr) Variable PushConstant
-             680:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 681 674 35 669 12 38 681 679(pushConsts) 83
-             682:             TypePointer PushConstant 7(int)
-             683:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 677 12
-             691:      7(int) Constant 145
-             693:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 180 20 35 691 12 55 40
-             695:   19(fvec3) ConstantComposite 237 237 237
-             697:      7(int) Constant 147
-             705:      7(int) Constant 148
-             713:      7(int) Constant 149
-             715:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 716 20 35 713 12 55 40
-             726:      7(int) Constant 150
-             728:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 729 20 35 726 12 55 40
-             743:      7(int) Constant 151
-             745:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 746 20 35 743 12 55 40
-             759:      7(int) Constant 152
-             771:      7(int) Constant 154
-             783:      7(int) Constant 155
-             795:      7(int) Constant 156
-             808:      7(int) Constant 157
-             817:      7(int) Constant 158
-             829:      7(int) Constant 161
-             841:      7(int) Constant 162
-             849:      7(int) Constant 163
-             861:      7(int) Constant 164
-             874:      7(int) Constant 165
-             883:      7(int) Constant 166
-             895:      7(int) Constant 168
-             907:      7(int) Constant 169
-             916:      7(int) Constant 170
-             929:      7(int) Constant 171
-             941:      7(int) Constant 172
-             953:      7(int) Constant 175
-             962:      7(int) Constant 10
-             963:  122(ivec3) ConstantComposite 962 962 39
-                              Line 1 72 11
+             225:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 219 35 221 12 38 2 224 82
+             230:             TypePointer Uniform 71(fvec4)
+             231:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 41 12
+             237:      7(int) Constant 83
+             238:     73(int) Constant 1
+             239:   16(float) Constant 0
+             240:   71(fvec4) ConstantComposite 239 239 239 239
+             243:      7(int) Constant 84
+             249:      7(int) Constant 88
+             247:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 248 20 35 249 12 55 40
+             253:     73(int) Constant 9
+             263:      7(int) Constant 90
+             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 262 20 35 263 12 55 40
+             273:      7(int) Constant 91
+             271:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 272 20 35 273 12 55 40
+             282:      7(int) Constant 95
+             290:      7(int) Constant 96
+             307:      7(int) Constant 99
+             319:      7(int) Constant 100
+             336:      7(int) Constant 103
+             348:      7(int) Constant 104
+             353:     73(int) Constant 5
+             369:      7(int) Constant 107
+             377:      7(int) Constant 108
+             397:      7(int) Constant 111
+             418:      7(int) Constant 112
+             424:     73(int) Constant 6
+             440:      7(int) Constant 115
+             457:      7(int) Constant 116
+             478:      7(int) Constant 119
+             503:      7(int) Constant 120
+             524:      7(int) Constant 123
+             545:      7(int) Constant 124
+             563:     73(int) Constant 3
+             567:      7(int) Constant 127
+             577:      7(int) Constant 130
+             575:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 576 20 35 577 12 55 40
+             587:      7(int) Constant 131
+             594:   16(float) Constant 1056964608
+             611:      7(int) Constant 132
+             626:      7(int) Constant 135
+             624:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 625 20 35 626 12 55 40
+             633:     73(int) Constant 8
+             640:      7(int) Constant 136
+             642:     73(int) Constant 7
+             645:   16(float) Constant 1008981770
+             653:      7(int) Constant 138
+             672:      7(int) Constant 140
+ 674(PushConsts):             TypeStruct 7(int)
+             677:      7(int) Constant 63
+             675:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 676 9 35 677 22 12 12 13
+             680:      7(int) Constant 144
+             678:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 679 39 35 680 12 38 679 12 13 675
+             681:             TypePointer PushConstant 674(PushConsts)
+             682:      7(int) Constant 9
+             683:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 678 682 12
+ 684(pushConsts):    681(ptr) Variable PushConstant
+             685:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 686 678 35 680 12 38 686 684(pushConsts) 82
+             687:             TypePointer PushConstant 7(int)
+             688:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 682 12
+             698:      7(int) Constant 145
+             697:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 179 20 35 698 12 55 40
+             702:   19(fvec3) ConstantComposite 239 239 239
+             705:      7(int) Constant 147
+             713:      7(int) Constant 148
+             721:      7(int) Constant 149
+             719:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 720 20 35 721 12 55 40
+             735:      7(int) Constant 150
+             733:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 734 20 35 735 12 55 40
+             752:      7(int) Constant 151
+             750:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 751 20 35 752 12 55 40
+             767:      7(int) Constant 152
+             779:      7(int) Constant 154
+             791:      7(int) Constant 155
+             803:      7(int) Constant 156
+             816:      7(int) Constant 157
+             825:      7(int) Constant 158
+             838:      7(int) Constant 161
+             850:      7(int) Constant 162
+             858:      7(int) Constant 163
+             870:      7(int) Constant 164
+             883:      7(int) Constant 165
+             892:      7(int) Constant 166
+             904:      7(int) Constant 168
+             916:      7(int) Constant 169
+             925:      7(int) Constant 170
+             938:      7(int) Constant 171
+             950:      7(int) Constant 172
+             963:      7(int) Constant 175
+             972:      7(int) Constant 10
+             973:  121(ivec3) ConstantComposite 972 972 39
         14(main):           4 Function None 5
               15:             Label
-         126(id):    124(ptr) Variable Function
-      140(index):    138(ptr) Variable Function
+         125(id):    123(ptr) Variable Function
+      139(index):    137(ptr) Variable Function
       246(force):     21(ptr) Variable Function
-        259(pos):     21(ptr) Variable Function
-        269(vel):     21(ptr) Variable Function
-      289(param):     21(ptr) Variable Function
-      293(param):     21(ptr) Variable Function
-      295(param):     24(ptr) Variable Function
-      318(param):     21(ptr) Variable Function
-      322(param):     21(ptr) Variable Function
-      324(param):     24(ptr) Variable Function
-      351(param):     21(ptr) Variable Function
-      355(param):     21(ptr) Variable Function
-      357(param):     24(ptr) Variable Function
-      379(param):     21(ptr) Variable Function
-      383(param):     21(ptr) Variable Function
-      385(param):     24(ptr) Variable Function
-      421(param):     21(ptr) Variable Function
+        260(pos):     21(ptr) Variable Function
+        270(vel):     21(ptr) Variable Function
+      292(param):     21(ptr) Variable Function
+      296(param):     21(ptr) Variable Function
+      298(param):     24(ptr) Variable Function
+      321(param):     21(ptr) Variable Function
+      325(param):     21(ptr) Variable Function
+      327(param):     24(ptr) Variable Function
+      354(param):     21(ptr) Variable Function
+      358(param):     21(ptr) Variable Function
+      360(param):     24(ptr) Variable Function
+      382(param):     21(ptr) Variable Function
+      386(param):     21(ptr) Variable Function
+      388(param):     24(ptr) Variable Function
       425(param):     21(ptr) Variable Function
-      427(param):     24(ptr) Variable Function
-      458(param):     21(ptr) Variable Function
-      462(param):     21(ptr) Variable Function
-      464(param):     24(ptr) Variable Function
-      503(param):     21(ptr) Variable Function
-      507(param):     21(ptr) Variable Function
-      509(param):     24(ptr) Variable Function
-      544(param):     21(ptr) Variable Function
-      548(param):     21(ptr) Variable Function
-      550(param):     24(ptr) Variable Function
-          569(f):     21(ptr) Variable Function
- 618(sphereDist):     21(ptr) Variable Function
-     692(normal):     21(ptr) Variable Function
-          714(a):     21(ptr) Variable Function
-          727(b):     21(ptr) Variable Function
-          744(c):     21(ptr) Variable Function
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 55 14(main)
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             120:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 121 121 12 12
-             129:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 127 126(id) 47
-             135:  122(ivec3) Load 132(gl_GlobalInvocationID)
-                              Store 126(id) 135
-             136:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 137 137 12 12
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 141 140(index) 47
-             144:    138(ptr) AccessChain 126(id) 39
-             145:      7(int) Load 144
-             149:    147(ptr) AccessChain 102(params) 146 12
-             150:     74(int) Load 149
-             151:      7(int) Bitcast 150
-             152:      7(int) IMul 145 151
-             153:    138(ptr) AccessChain 126(id) 12
-             154:      7(int) Load 153
-             155:      7(int) IAdd 152 154
-                              Store 140(index) 155
-             156:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 157 157 12 12
-             158:      7(int) Load 140(index)
-             159:    147(ptr) AccessChain 102(params) 146 12
-             160:     74(int) Load 159
-             161:    147(ptr) AccessChain 102(params) 146 39
-             162:     74(int) Load 161
-             163:     74(int) IMul 160 162
-             164:      7(int) Bitcast 163
-             168:   165(bool) UGreaterThan 158 164
-                              SelectionMerge 170 None
-                              BranchConditional 168 169 170
-             169:               Label
-             171:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             172:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 173 173 12 12
+      429(param):     21(ptr) Variable Function
+      431(param):     24(ptr) Variable Function
+      463(param):     21(ptr) Variable Function
+      467(param):     21(ptr) Variable Function
+      469(param):     24(ptr) Variable Function
+      509(param):     21(ptr) Variable Function
+      513(param):     21(ptr) Variable Function
+      515(param):     24(ptr) Variable Function
+      551(param):     21(ptr) Variable Function
+      555(param):     21(ptr) Variable Function
+      557(param):     24(ptr) Variable Function
+          574(f):     21(ptr) Variable Function
+ 623(sphereDist):     21(ptr) Variable Function
+     696(normal):     21(ptr) Variable Function
+          718(a):     21(ptr) Variable Function
+          732(b):     21(ptr) Variable Function
+          749(c):     21(ptr) Variable Function
+             119:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             120:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 56 56 12 12
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 55 14(main)
+             130:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 128 128 12 12
+             129:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 126 125(id) 45
+             136:  121(ivec3) Load 133(gl_GlobalInvocationID)
+                              Store 125(id) 136
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 142 142 12 12
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 140 139(index) 45
+             145:    137(ptr) AccessChain 125(id) 39
+             146:      7(int) Load 145
+             150:    148(ptr) AccessChain 101(params) 147 12
+             151:     73(int) Load 150
+             152:      7(int) Bitcast 151
+             153:      7(int) IMul 146 152
+             154:    137(ptr) AccessChain 125(id) 12
+             155:      7(int) Load 154
+             156:      7(int) IAdd 153 155
+                              Store 139(index) 156
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 159 159 12 12
+             157:      7(int) Load 139(index)
+             160:    148(ptr) AccessChain 101(params) 147 12
+             161:     73(int) Load 160
+             162:    148(ptr) AccessChain 101(params) 147 39
+             163:     73(int) Load 162
+             164:     73(int) IMul 161 163
+             165:      7(int) Bitcast 164
+             169:   166(bool) UGreaterThan 157 165
+                              SelectionMerge 171 None
+                              BranchConditional 169 170 171
+             170:               Label
+             172:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             173:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 174 174 12 12
                                 Return
-             170:             Label
-             175:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             176:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 177 177 12 12
-             203:      7(int) Load 140(index)
-             205:    106(ptr) AccessChain 200 202 203 204
-             206:   16(float) Load 205
-             208:   165(bool) FOrdEqual 206 207
-                              SelectionMerge 210 None
-                              BranchConditional 208 209 210
-             209:               Label
-             211:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             212:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 213 213 12 12
-             226:      7(int)   Load 140(index)
-             227:      7(int)   Load 140(index)
-             230:    228(ptr)   AccessChain 224 202 227 202
-             231:   72(fvec4)   Load 230
-             232:    228(ptr)   AccessChain 224 202 226 202
-                                Store 232 231
-             233:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 234 234 12 12
-             235:      7(int)   Load 140(index)
-             239:    228(ptr)   AccessChain 224 202 235 236
-                                Store 239 238
-             240:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 241 241 12 12
+             171:             Label
+             204:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             205:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 188 188 12 12
+             203:      7(int) Load 139(index)
+             207:    105(ptr) AccessChain 200 202 203 206
+             208:   16(float) Load 207
+             210:   166(bool) FOrdEqual 208 209
+                              SelectionMerge 212 None
+                              BranchConditional 210 211 212
+             211:               Label
+             227:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             228:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 221 221 12 12
+             226:      7(int)   Load 139(index)
+             229:      7(int)   Load 139(index)
+             232:    230(ptr)   AccessChain 224 202 229 202
+             233:   71(fvec4)   Load 232
+             234:    230(ptr)   AccessChain 224 202 226 202
+                                Store 234 233
+             236:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 237 237 12 12
+             235:      7(int)   Load 139(index)
+             241:    230(ptr)   AccessChain 224 202 235 238
+                                Store 241 240
+             242:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 243 243 12 12
                                 Return
-             210:             Label
-             243:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             244:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 245 245 12 12
-             249:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 247 246(force) 47
-             251:    228(ptr) AccessChain 102(params) 250
-             252:   72(fvec4) Load 251
-             253:   19(fvec3) VectorShuffle 252 252 0 1 2
-             254:    106(ptr) AccessChain 102(params) 236
-             255:   16(float) Load 254
-             256:   19(fvec3) VectorTimesScalar 253 255
-                              Store 246(force) 256
-             257:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 258 258 12 12
-             262:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 260 259(pos) 47
-             263:      7(int) Load 140(index)
-             264:    228(ptr) AccessChain 200 202 263 202
-             265:   72(fvec4) Load 264
-             266:   19(fvec3) VectorShuffle 265 265 0 1 2
-                              Store 259(pos) 266
-             267:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 268 268 12 12
-             272:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 270 269(vel) 47
-             273:      7(int) Load 140(index)
-             274:    228(ptr) AccessChain 200 202 273 236
-             275:   72(fvec4) Load 274
-             276:   19(fvec3) VectorShuffle 275 275 0 1 2
-                              Store 269(vel) 276
-             277:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 278 278 12 12
-             279:    138(ptr) AccessChain 126(id) 12
-             280:      7(int) Load 279
-             281:   165(bool) UGreaterThan 280 12
-                              SelectionMerge 283 None
-                              BranchConditional 281 282 283
-             282:               Label
-             284:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             285:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 286 286 12 12
-             287:      7(int)   Load 140(index)
-             288:      7(int)   ISub 287 39
-             290:    228(ptr)   AccessChain 200 202 288 202
-             291:   72(fvec4)   Load 290
-             292:   19(fvec3)   VectorShuffle 291 291 0 1 2
-                                Store 289(param) 292
-             294:   19(fvec3)   Load 259(pos)
-                                Store 293(param) 294
-             296:    106(ptr)   AccessChain 102(params) 204
-             297:   16(float)   Load 296
-                                Store 295(param) 297
-             298:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 289(param) 293(param) 295(param)
-             299:   19(fvec3)   Load 246(force)
-             300:   19(fvec3)   FAdd 299 298
-                                Store 246(force) 300
-                                Branch 283
-             283:             Label
-             301:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             302:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 303 303 12 12
-             304:    138(ptr) AccessChain 126(id) 12
-             305:      7(int) Load 304
-             306:    147(ptr) AccessChain 102(params) 146 12
-             307:     74(int) Load 306
-             308:     74(int) ISub 307 236
-             309:      7(int) Bitcast 308
-             310:   165(bool) ULessThan 305 309
-                              SelectionMerge 312 None
-                              BranchConditional 310 311 312
-             311:               Label
-             313:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             314:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 315 315 12 12
-             316:      7(int)   Load 140(index)
-             317:      7(int)   IAdd 316 39
-             319:    228(ptr)   AccessChain 200 202 317 202
-             320:   72(fvec4)   Load 319
-             321:   19(fvec3)   VectorShuffle 320 320 0 1 2
-                                Store 318(param) 321
-             323:   19(fvec3)   Load 259(pos)
-                                Store 322(param) 323
-             325:    106(ptr)   AccessChain 102(params) 204
-             326:   16(float)   Load 325
-                                Store 324(param) 326
-             327:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 318(param) 322(param) 324(param)
-             328:   19(fvec3)   Load 246(force)
-             329:   19(fvec3)   FAdd 328 327
-                                Store 246(force) 329
-                                Branch 312
-             312:             Label
-             330:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             331:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 332 332 12 12
-             333:    138(ptr) AccessChain 126(id) 39
-             334:      7(int) Load 333
-             335:    147(ptr) AccessChain 102(params) 146 39
-             336:     74(int) Load 335
-             337:     74(int) ISub 336 236
-             338:      7(int) Bitcast 337
-             339:   165(bool) ULessThan 334 338
-                              SelectionMerge 341 None
-                              BranchConditional 339 340 341
-             340:               Label
-             342:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             343:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 344 344 12 12
-             345:      7(int)   Load 140(index)
-             346:    147(ptr)   AccessChain 102(params) 146 12
-             347:     74(int)   Load 346
-             348:      7(int)   Bitcast 347
-             349:      7(int)   IAdd 345 348
-             352:    228(ptr)   AccessChain 200 202 349 202
-             353:   72(fvec4)   Load 352
-             354:   19(fvec3)   VectorShuffle 353 353 0 1 2
-                                Store 351(param) 354
-             356:   19(fvec3)   Load 259(pos)
-                                Store 355(param) 356
-             358:    106(ptr)   AccessChain 102(params) 350
-             359:   16(float)   Load 358
-                                Store 357(param) 359
-             360:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 351(param) 355(param) 357(param)
-             361:   19(fvec3)   Load 246(force)
-             362:   19(fvec3)   FAdd 361 360
-                                Store 246(force) 362
-                                Branch 341
-             341:             Label
-             363:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             364:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 365 365 12 12
-             366:    138(ptr) AccessChain 126(id) 39
-             367:      7(int) Load 366
-             368:   165(bool) UGreaterThan 367 12
-                              SelectionMerge 370 None
-                              BranchConditional 368 369 370
-             369:               Label
-             371:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             372:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 373 373 12 12
-             374:      7(int)   Load 140(index)
-             375:    147(ptr)   AccessChain 102(params) 146 12
-             376:     74(int)   Load 375
-             377:      7(int)   Bitcast 376
-             378:      7(int)   ISub 374 377
-             380:    228(ptr)   AccessChain 200 202 378 202
-             381:   72(fvec4)   Load 380
-             382:   19(fvec3)   VectorShuffle 381 381 0 1 2
-                                Store 379(param) 382
-             384:   19(fvec3)   Load 259(pos)
-                                Store 383(param) 384
-             386:    106(ptr)   AccessChain 102(params) 350
-             387:   16(float)   Load 386
-                                Store 385(param) 387
-             388:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 379(param) 383(param) 385(param)
-             389:   19(fvec3)   Load 246(force)
-             390:   19(fvec3)   FAdd 389 388
-                                Store 246(force) 390
-                                Branch 370
-             370:             Label
-             391:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             392:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 393 393 12 12
-             394:    138(ptr) AccessChain 126(id) 12
-             395:      7(int) Load 394
-             396:   165(bool) UGreaterThan 395 12
-                              SelectionMerge 398 None
-                              BranchConditional 396 397 398
-             397:               Label
-             399:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             400:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 393 393 12 12
-             401:    138(ptr)   AccessChain 126(id) 39
-             402:      7(int)   Load 401
-             403:    147(ptr)   AccessChain 102(params) 146 39
-             404:     74(int)   Load 403
-             405:     74(int)   ISub 404 236
-             406:      7(int)   Bitcast 405
-             407:   165(bool)   ULessThan 402 406
-                                Branch 398
-             398:             Label
-             408:   165(bool) Phi 396 370 407 397
-                              SelectionMerge 410 None
-                              BranchConditional 408 409 410
-             409:               Label
-             411:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             412:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 413 413 12 12
-             414:      7(int)   Load 140(index)
-             415:    147(ptr)   AccessChain 102(params) 146 12
-             416:     74(int)   Load 415
-             417:      7(int)   Bitcast 416
-             418:      7(int)   IAdd 414 417
-             419:      7(int)   ISub 418 39
-             422:    228(ptr)   AccessChain 200 202 419 202
-             423:   72(fvec4)   Load 422
-             424:   19(fvec3)   VectorShuffle 423 423 0 1 2
-                                Store 421(param) 424
-             426:   19(fvec3)   Load 259(pos)
-                                Store 425(param) 426
-             428:    106(ptr)   AccessChain 102(params) 420
-             429:   16(float)   Load 428
-                                Store 427(param) 429
-             430:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 421(param) 425(param) 427(param)
-             431:   19(fvec3)   Load 246(force)
-             432:   19(fvec3)   FAdd 431 430
-                                Store 246(force) 432
-                                Branch 410
-             410:             Label
-             433:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             434:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 435 435 12 12
-             436:    138(ptr) AccessChain 126(id) 12
-             437:      7(int) Load 436
-             438:   165(bool) UGreaterThan 437 12
-                              SelectionMerge 440 None
-                              BranchConditional 438 439 440
-             439:               Label
-             441:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             442:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 435 435 12 12
-             443:    138(ptr)   AccessChain 126(id) 39
-             444:      7(int)   Load 443
-             445:   165(bool)   UGreaterThan 444 12
-                                Branch 440
-             440:             Label
-             446:   165(bool) Phi 438 410 445 439
-                              SelectionMerge 448 None
-                              BranchConditional 446 447 448
-             447:               Label
-             449:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             450:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 451 451 12 12
-             452:      7(int)   Load 140(index)
-             453:    147(ptr)   AccessChain 102(params) 146 12
-             454:     74(int)   Load 453
-             455:      7(int)   Bitcast 454
-             456:      7(int)   ISub 452 455
-             457:      7(int)   ISub 456 39
-             459:    228(ptr)   AccessChain 200 202 457 202
-             460:   72(fvec4)   Load 459
-             461:   19(fvec3)   VectorShuffle 460 460 0 1 2
-                                Store 458(param) 461
-             463:   19(fvec3)   Load 259(pos)
-                                Store 462(param) 463
-             465:    106(ptr)   AccessChain 102(params) 420
-             466:   16(float)   Load 465
-                                Store 464(param) 466
-             467:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 458(param) 462(param) 464(param)
-             468:   19(fvec3)   Load 246(force)
-             469:   19(fvec3)   FAdd 468 467
-                                Store 246(force) 469
-                                Branch 448
-             448:             Label
-             470:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             471:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 472 472 12 12
-             473:    138(ptr) AccessChain 126(id) 12
-             474:      7(int) Load 473
-             475:    147(ptr) AccessChain 102(params) 146 12
-             476:     74(int) Load 475
-             477:     74(int) ISub 476 236
-             478:      7(int) Bitcast 477
-             479:   165(bool) ULessThan 474 478
-                              SelectionMerge 481 None
-                              BranchConditional 479 480 481
-             480:               Label
-             482:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             483:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 472 472 12 12
-             484:    138(ptr)   AccessChain 126(id) 39
-             485:      7(int)   Load 484
-             486:    147(ptr)   AccessChain 102(params) 146 39
-             487:     74(int)   Load 486
-             488:     74(int)   ISub 487 236
-             489:      7(int)   Bitcast 488
-             490:   165(bool)   ULessThan 485 489
-                                Branch 481
-             481:             Label
-             491:   165(bool) Phi 479 448 490 480
-                              SelectionMerge 493 None
-                              BranchConditional 491 492 493
-             492:               Label
-             494:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             495:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 496 496 12 12
-             497:      7(int)   Load 140(index)
-             498:    147(ptr)   AccessChain 102(params) 146 12
-             499:     74(int)   Load 498
-             500:      7(int)   Bitcast 499
-             501:      7(int)   IAdd 497 500
-             502:      7(int)   IAdd 501 39
-             504:    228(ptr)   AccessChain 200 202 502 202
-             505:   72(fvec4)   Load 504
-             506:   19(fvec3)   VectorShuffle 505 505 0 1 2
-                                Store 503(param) 506
-             508:   19(fvec3)   Load 259(pos)
-                                Store 507(param) 508
-             510:    106(ptr)   AccessChain 102(params) 420
-             511:   16(float)   Load 510
-                                Store 509(param) 511
-             512:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 503(param) 507(param) 509(param)
-             513:   19(fvec3)   Load 246(force)
-             514:   19(fvec3)   FAdd 513 512
-                                Store 246(force) 514
-                                Branch 493
-             493:             Label
-             515:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             516:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 517 517 12 12
-             518:    138(ptr) AccessChain 126(id) 12
-             519:      7(int) Load 518
-             520:    147(ptr) AccessChain 102(params) 146 12
-             521:     74(int) Load 520
-             522:     74(int) ISub 521 236
-             523:      7(int) Bitcast 522
-             524:   165(bool) ULessThan 519 523
-                              SelectionMerge 526 None
-                              BranchConditional 524 525 526
-             525:               Label
-             527:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             528:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 517 517 12 12
-             529:    138(ptr)   AccessChain 126(id) 39
-             530:      7(int)   Load 529
-             531:   165(bool)   UGreaterThan 530 12
-                                Branch 526
-             526:             Label
-             532:   165(bool) Phi 524 493 531 525
-                              SelectionMerge 534 None
-                              BranchConditional 532 533 534
-             533:               Label
-             535:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             536:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 537 537 12 12
-             538:      7(int)   Load 140(index)
-             539:    147(ptr)   AccessChain 102(params) 146 12
-             540:     74(int)   Load 539
-             541:      7(int)   Bitcast 540
-             542:      7(int)   ISub 538 541
-             543:      7(int)   IAdd 542 39
-             545:    228(ptr)   AccessChain 200 202 543 202
-             546:   72(fvec4)   Load 545
-             547:   19(fvec3)   VectorShuffle 546 546 0 1 2
-                                Store 544(param) 547
-             549:   19(fvec3)   Load 259(pos)
-                                Store 548(param) 549
-             551:    106(ptr)   AccessChain 102(params) 420
-             552:   16(float)   Load 551
-                                Store 550(param) 552
-             553:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 544(param) 548(param) 550(param)
-             554:   19(fvec3)   Load 246(force)
-             555:   19(fvec3)   FAdd 554 553
-                                Store 246(force) 555
-                                Branch 534
-             534:             Label
-             556:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             557:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 558 558 12 12
-             560:    106(ptr) AccessChain 102(params) 559
-             561:   16(float) Load 560
-             562:   16(float) FNegate 561
-             563:   19(fvec3) Load 269(vel)
-             564:   19(fvec3) VectorTimesScalar 563 562
-             565:   19(fvec3) Load 246(force)
-             566:   19(fvec3) FAdd 565 564
-                              Store 246(force) 566
-             567:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 568 568 12 12
-             572:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 570 569(f) 47
-             573:   19(fvec3) Load 246(force)
-             574:    106(ptr) AccessChain 102(params) 236
-             575:   16(float) Load 574
-             576:   16(float) FDiv 207 575
-             577:   19(fvec3) VectorTimesScalar 573 576
-                              Store 569(f) 577
-             578:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 579 579 12 12
-             580:      7(int) Load 140(index)
-             581:   19(fvec3) Load 259(pos)
-             582:   19(fvec3) Load 269(vel)
-             583:    106(ptr) AccessChain 102(params) 202
-             584:   16(float) Load 583
-             585:   19(fvec3) VectorTimesScalar 582 584
-             586:   19(fvec3) FAdd 581 585
-             588:   19(fvec3) Load 569(f)
-             589:   19(fvec3) VectorTimesScalar 588 587
-             590:    106(ptr) AccessChain 102(params) 202
+             212:             Label
+             251:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             252:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 249 249 12 12
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 247 246(force) 45
+             254:    230(ptr) AccessChain 101(params) 253
+             255:   71(fvec4) Load 254
+             256:   19(fvec3) VectorShuffle 255 255 0 1 2
+             257:    105(ptr) AccessChain 101(params) 238
+             258:   16(float) Load 257
+             259:   19(fvec3) VectorTimesScalar 256 258
+                              Store 246(force) 259
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 263 263 12 12
+             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 261 260(pos) 45
+             266:      7(int) Load 139(index)
+             267:    230(ptr) AccessChain 200 202 266 202
+             268:   71(fvec4) Load 267
+             269:   19(fvec3) VectorShuffle 268 268 0 1 2
+                              Store 260(pos) 269
+             275:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 273 273 12 12
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 271 270(vel) 45
+             276:      7(int) Load 139(index)
+             277:    230(ptr) AccessChain 200 202 276 238
+             278:   71(fvec4) Load 277
+             279:   19(fvec3) VectorShuffle 278 278 0 1 2
+                              Store 270(vel) 279
+             281:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 282 282 12 12
+             280:    137(ptr) AccessChain 125(id) 12
+             283:      7(int) Load 280
+             284:   166(bool) UGreaterThan 283 12
+                              SelectionMerge 286 None
+                              BranchConditional 284 285 286
+             285:               Label
+             288:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             289:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 290 290 12 12
+             287:      7(int)   Load 139(index)
+             291:      7(int)   ISub 287 39
+             293:    230(ptr)   AccessChain 200 202 291 202
+             294:   71(fvec4)   Load 293
+             295:   19(fvec3)   VectorShuffle 294 294 0 1 2
+                                Store 292(param) 295
+             297:   19(fvec3)   Load 260(pos)
+                                Store 296(param) 297
+             299:    105(ptr)   AccessChain 101(params) 206
+             300:   16(float)   Load 299
+                                Store 298(param) 300
+             301:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 292(param) 296(param) 298(param)
+             302:   19(fvec3)   Load 246(force)
+             303:   19(fvec3)   FAdd 302 301
+                                Store 246(force) 303
+                                Branch 286
+             286:             Label
+             305:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             306:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 307 307 12 12
+             304:    137(ptr) AccessChain 125(id) 12
+             308:      7(int) Load 304
+             309:    148(ptr) AccessChain 101(params) 147 12
+             310:     73(int) Load 309
+             311:     73(int) ISub 310 238
+             312:      7(int) Bitcast 311
+             313:   166(bool) ULessThan 308 312
+                              SelectionMerge 315 None
+                              BranchConditional 313 314 315
+             314:               Label
+             317:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             318:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 319 319 12 12
+             316:      7(int)   Load 139(index)
+             320:      7(int)   IAdd 316 39
+             322:    230(ptr)   AccessChain 200 202 320 202
+             323:   71(fvec4)   Load 322
+             324:   19(fvec3)   VectorShuffle 323 323 0 1 2
+                                Store 321(param) 324
+             326:   19(fvec3)   Load 260(pos)
+                                Store 325(param) 326
+             328:    105(ptr)   AccessChain 101(params) 206
+             329:   16(float)   Load 328
+                                Store 327(param) 329
+             330:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 321(param) 325(param) 327(param)
+             331:   19(fvec3)   Load 246(force)
+             332:   19(fvec3)   FAdd 331 330
+                                Store 246(force) 332
+                                Branch 315
+             315:             Label
+             334:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             335:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 336 336 12 12
+             333:    137(ptr) AccessChain 125(id) 39
+             337:      7(int) Load 333
+             338:    148(ptr) AccessChain 101(params) 147 39
+             339:     73(int) Load 338
+             340:     73(int) ISub 339 238
+             341:      7(int) Bitcast 340
+             342:   166(bool) ULessThan 337 341
+                              SelectionMerge 344 None
+                              BranchConditional 342 343 344
+             343:               Label
+             346:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             347:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 348 348 12 12
+             345:      7(int)   Load 139(index)
+             349:    148(ptr)   AccessChain 101(params) 147 12
+             350:     73(int)   Load 349
+             351:      7(int)   Bitcast 350
+             352:      7(int)   IAdd 345 351
+             355:    230(ptr)   AccessChain 200 202 352 202
+             356:   71(fvec4)   Load 355
+             357:   19(fvec3)   VectorShuffle 356 356 0 1 2
+                                Store 354(param) 357
+             359:   19(fvec3)   Load 260(pos)
+                                Store 358(param) 359
+             361:    105(ptr)   AccessChain 101(params) 353
+             362:   16(float)   Load 361
+                                Store 360(param) 362
+             363:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 354(param) 358(param) 360(param)
+             364:   19(fvec3)   Load 246(force)
+             365:   19(fvec3)   FAdd 364 363
+                                Store 246(force) 365
+                                Branch 344
+             344:             Label
+             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 369 369 12 12
+             366:    137(ptr) AccessChain 125(id) 39
+             370:      7(int) Load 366
+             371:   166(bool) UGreaterThan 370 12
+                              SelectionMerge 373 None
+                              BranchConditional 371 372 373
+             372:               Label
+             375:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             376:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 377 377 12 12
+             374:      7(int)   Load 139(index)
+             378:    148(ptr)   AccessChain 101(params) 147 12
+             379:     73(int)   Load 378
+             380:      7(int)   Bitcast 379
+             381:      7(int)   ISub 374 380
+             383:    230(ptr)   AccessChain 200 202 381 202
+             384:   71(fvec4)   Load 383
+             385:   19(fvec3)   VectorShuffle 384 384 0 1 2
+                                Store 382(param) 385
+             387:   19(fvec3)   Load 260(pos)
+                                Store 386(param) 387
+             389:    105(ptr)   AccessChain 101(params) 353
+             390:   16(float)   Load 389
+                                Store 388(param) 390
+             391:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 382(param) 386(param) 388(param)
+             392:   19(fvec3)   Load 246(force)
+             393:   19(fvec3)   FAdd 392 391
+                                Store 246(force) 393
+                                Branch 373
+             373:             Label
+             395:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             396:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 397 397 12 12
+             394:    137(ptr) AccessChain 125(id) 12
+             398:      7(int) Load 394
+             399:   166(bool) UGreaterThan 398 12
+                              SelectionMerge 401 None
+                              BranchConditional 399 400 401
+             400:               Label
+             403:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             404:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 397 397 12 12
+             402:    137(ptr)   AccessChain 125(id) 39
+             405:      7(int)   Load 402
+             406:    148(ptr)   AccessChain 101(params) 147 39
+             407:     73(int)   Load 406
+             408:     73(int)   ISub 407 238
+             409:      7(int)   Bitcast 408
+             410:   166(bool)   ULessThan 405 409
+                                Branch 401
+             401:             Label
+             412:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             411:   166(bool) Phi 399 373 410 400
+                              SelectionMerge 414 None
+                              BranchConditional 411 413 414
+             413:               Label
+             416:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             417:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 418 418 12 12
+             415:      7(int)   Load 139(index)
+             419:    148(ptr)   AccessChain 101(params) 147 12
+             420:     73(int)   Load 419
+             421:      7(int)   Bitcast 420
+             422:      7(int)   IAdd 415 421
+             423:      7(int)   ISub 422 39
+             426:    230(ptr)   AccessChain 200 202 423 202
+             427:   71(fvec4)   Load 426
+             428:   19(fvec3)   VectorShuffle 427 427 0 1 2
+                                Store 425(param) 428
+             430:   19(fvec3)   Load 260(pos)
+                                Store 429(param) 430
+             432:    105(ptr)   AccessChain 101(params) 424
+             433:   16(float)   Load 432
+                                Store 431(param) 433
+             434:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 425(param) 429(param) 431(param)
+             435:   19(fvec3)   Load 246(force)
+             436:   19(fvec3)   FAdd 435 434
+                                Store 246(force) 436
+                                Branch 414
+             414:             Label
+             438:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             439:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 440 440 12 12
+             437:    137(ptr) AccessChain 125(id) 12
+             441:      7(int) Load 437
+             442:   166(bool) UGreaterThan 441 12
+                              SelectionMerge 444 None
+                              BranchConditional 442 443 444
+             443:               Label
+             446:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             447:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 440 440 12 12
+             445:    137(ptr)   AccessChain 125(id) 39
+             448:      7(int)   Load 445
+             449:   166(bool)   UGreaterThan 448 12
+                                Branch 444
+             444:             Label
+             451:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             450:   166(bool) Phi 442 414 449 443
+                              SelectionMerge 453 None
+                              BranchConditional 450 452 453
+             452:               Label
+             455:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             456:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 457 457 12 12
+             454:      7(int)   Load 139(index)
+             458:    148(ptr)   AccessChain 101(params) 147 12
+             459:     73(int)   Load 458
+             460:      7(int)   Bitcast 459
+             461:      7(int)   ISub 454 460
+             462:      7(int)   ISub 461 39
+             464:    230(ptr)   AccessChain 200 202 462 202
+             465:   71(fvec4)   Load 464
+             466:   19(fvec3)   VectorShuffle 465 465 0 1 2
+                                Store 463(param) 466
+             468:   19(fvec3)   Load 260(pos)
+                                Store 467(param) 468
+             470:    105(ptr)   AccessChain 101(params) 424
+             471:   16(float)   Load 470
+                                Store 469(param) 471
+             472:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 463(param) 467(param) 469(param)
+             473:   19(fvec3)   Load 246(force)
+             474:   19(fvec3)   FAdd 473 472
+                                Store 246(force) 474
+                                Branch 453
+             453:             Label
+             476:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             477:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 478 478 12 12
+             475:    137(ptr) AccessChain 125(id) 12
+             479:      7(int) Load 475
+             480:    148(ptr) AccessChain 101(params) 147 12
+             481:     73(int) Load 480
+             482:     73(int) ISub 481 238
+             483:      7(int) Bitcast 482
+             484:   166(bool) ULessThan 479 483
+                              SelectionMerge 486 None
+                              BranchConditional 484 485 486
+             485:               Label
+             488:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             489:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 478 478 12 12
+             487:    137(ptr)   AccessChain 125(id) 39
+             490:      7(int)   Load 487
+             491:    148(ptr)   AccessChain 101(params) 147 39
+             492:     73(int)   Load 491
+             493:     73(int)   ISub 492 238
+             494:      7(int)   Bitcast 493
+             495:   166(bool)   ULessThan 490 494
+                                Branch 486
+             486:             Label
+             497:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             496:   166(bool) Phi 484 453 495 485
+                              SelectionMerge 499 None
+                              BranchConditional 496 498 499
+             498:               Label
+             501:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             502:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 503 503 12 12
+             500:      7(int)   Load 139(index)
+             504:    148(ptr)   AccessChain 101(params) 147 12
+             505:     73(int)   Load 504
+             506:      7(int)   Bitcast 505
+             507:      7(int)   IAdd 500 506
+             508:      7(int)   IAdd 507 39
+             510:    230(ptr)   AccessChain 200 202 508 202
+             511:   71(fvec4)   Load 510
+             512:   19(fvec3)   VectorShuffle 511 511 0 1 2
+                                Store 509(param) 512
+             514:   19(fvec3)   Load 260(pos)
+                                Store 513(param) 514
+             516:    105(ptr)   AccessChain 101(params) 424
+             517:   16(float)   Load 516
+                                Store 515(param) 517
+             518:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 509(param) 513(param) 515(param)
+             519:   19(fvec3)   Load 246(force)
+             520:   19(fvec3)   FAdd 519 518
+                                Store 246(force) 520
+                                Branch 499
+             499:             Label
+             522:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             523:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 524 524 12 12
+             521:    137(ptr) AccessChain 125(id) 12
+             525:      7(int) Load 521
+             526:    148(ptr) AccessChain 101(params) 147 12
+             527:     73(int) Load 526
+             528:     73(int) ISub 527 238
+             529:      7(int) Bitcast 528
+             530:   166(bool) ULessThan 525 529
+                              SelectionMerge 532 None
+                              BranchConditional 530 531 532
+             531:               Label
+             534:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             535:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 524 524 12 12
+             533:    137(ptr)   AccessChain 125(id) 39
+             536:      7(int)   Load 533
+             537:   166(bool)   UGreaterThan 536 12
+                                Branch 532
+             532:             Label
+             539:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             538:   166(bool) Phi 530 499 537 531
+                              SelectionMerge 541 None
+                              BranchConditional 538 540 541
+             540:               Label
+             543:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             544:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 545 545 12 12
+             542:      7(int)   Load 139(index)
+             546:    148(ptr)   AccessChain 101(params) 147 12
+             547:     73(int)   Load 546
+             548:      7(int)   Bitcast 547
+             549:      7(int)   ISub 542 548
+             550:      7(int)   IAdd 549 39
+             552:    230(ptr)   AccessChain 200 202 550 202
+             553:   71(fvec4)   Load 552
+             554:   19(fvec3)   VectorShuffle 553 553 0 1 2
+                                Store 551(param) 554
+             556:   19(fvec3)   Load 260(pos)
+                                Store 555(param) 556
+             558:    105(ptr)   AccessChain 101(params) 424
+             559:   16(float)   Load 558
+                                Store 557(param) 559
+             560:   19(fvec3)   FunctionCall 31(springForce(vf3;vf3;f1;) 551(param) 555(param) 557(param)
+             561:   19(fvec3)   Load 246(force)
+             562:   19(fvec3)   FAdd 561 560
+                                Store 246(force) 562
+                                Branch 541
+             541:             Label
+             565:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             566:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 567 567 12 12
+             564:    105(ptr) AccessChain 101(params) 563
+             568:   16(float) Load 564
+             569:   16(float) FNegate 568
+             570:   19(fvec3) Load 270(vel)
+             571:   19(fvec3) VectorTimesScalar 570 569
+             572:   19(fvec3) Load 246(force)
+             573:   19(fvec3) FAdd 572 571
+                              Store 246(force) 573
+             579:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 577 577 12 12
+             578:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 575 574(f) 45
+             580:   19(fvec3) Load 246(force)
+             581:    105(ptr) AccessChain 101(params) 238
+             582:   16(float) Load 581
+             583:   16(float) FDiv 209 582
+             584:   19(fvec3) VectorTimesScalar 580 583
+                              Store 574(f) 584
+             586:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 587 587 12 12
+             585:      7(int) Load 139(index)
+             588:   19(fvec3) Load 260(pos)
+             589:   19(fvec3) Load 270(vel)
+             590:    105(ptr) AccessChain 101(params) 202
              591:   16(float) Load 590
              592:   19(fvec3) VectorTimesScalar 589 591
-             593:    106(ptr) AccessChain 102(params) 202
-             594:   16(float) Load 593
-             595:   19(fvec3) VectorTimesScalar 592 594
-             596:   19(fvec3) FAdd 586 595
-             597:   16(float) CompositeExtract 596 0
-             598:   16(float) CompositeExtract 596 1
-             599:   16(float) CompositeExtract 596 2
-             600:   72(fvec4) CompositeConstruct 597 598 599 207
-             601:    228(ptr) AccessChain 224 202 580 202
-                              Store 601 600
-             602:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 603 603 12 12
-             604:      7(int) Load 140(index)
-             605:   19(fvec3) Load 269(vel)
-             606:   19(fvec3) Load 569(f)
-             607:    106(ptr) AccessChain 102(params) 202
-             608:   16(float) Load 607
-             609:   19(fvec3) VectorTimesScalar 606 608
-             610:   19(fvec3) FAdd 605 609
-             611:   16(float) CompositeExtract 610 0
-             612:   16(float) CompositeExtract 610 1
-             613:   16(float) CompositeExtract 610 2
-             614:   72(fvec4) CompositeConstruct 611 612 613 237
-             615:    228(ptr) AccessChain 224 202 604 236
-                              Store 615 614
-             616:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 617 617 12 12
-             621:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 619 618(sphereDist) 47
-             622:      7(int) Load 140(index)
-             623:    228(ptr) AccessChain 224 202 622 202
-             624:   72(fvec4) Load 623
-             625:   19(fvec3) VectorShuffle 624 624 0 1 2
-             627:    228(ptr) AccessChain 102(params) 626
-             628:   72(fvec4) Load 627
-             629:   19(fvec3) VectorShuffle 628 628 0 1 2
-             630:   19(fvec3) FSub 625 629
-                              Store 618(sphereDist) 630
-             631:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 632 632 12 12
-             633:   19(fvec3) Load 618(sphereDist)
-             634:   16(float) ExtInst 3(GLSL.std.450) 66(Length) 633
-             636:    106(ptr) AccessChain 102(params) 635
-             637:   16(float) Load 636
-             639:   16(float) FAdd 637 638
-             640:   165(bool) FOrdLessThan 634 639
-                              SelectionMerge 642 None
-                              BranchConditional 640 641 642
-             641:               Label
-             643:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             644:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 645 645 12 12
-             646:      7(int)   Load 140(index)
-             647:    228(ptr)   AccessChain 102(params) 626
-             648:   72(fvec4)   Load 647
-             649:   19(fvec3)   VectorShuffle 648 648 0 1 2
-             650:   19(fvec3)   Load 618(sphereDist)
-             651:   19(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 650
-             652:    106(ptr)   AccessChain 102(params) 635
-             653:   16(float)   Load 652
-             654:   16(float)   FAdd 653 638
-             655:   19(fvec3)   VectorTimesScalar 651 654
-             656:   19(fvec3)   FAdd 649 655
-             657:    106(ptr)   AccessChain 224 202 646 202 12
-             658:   16(float)   CompositeExtract 656 0
-                                Store 657 658
-             659:    106(ptr)   AccessChain 224 202 646 202 39
-             660:   16(float)   CompositeExtract 656 1
-                                Store 659 660
-             661:    106(ptr)   AccessChain 224 202 646 202 41
-             662:   16(float)   CompositeExtract 656 2
-                                Store 661 662
-             663:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 664 664 12 12
-             665:      7(int)   Load 140(index)
-             666:    228(ptr)   AccessChain 224 202 665 236
-                                Store 666 238
-                                Branch 642
-             642:             Label
-             667:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             668:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 669 669 12 12
-             684:    682(ptr) AccessChain 679(pushConsts) 202
-             685:      7(int) Load 684
-             686:   165(bool) IEqual 685 39
-                              SelectionMerge 688 None
-                              BranchConditional 686 687 688
-             687:               Label
-             689:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             690:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 691 691 12 12
-             694:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 693 692(normal) 47
-                                Store 692(normal) 695
-             696:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 697 697 12 12
-             698:    138(ptr)   AccessChain 126(id) 39
-             699:      7(int)   Load 698
-             700:   165(bool)   UGreaterThan 699 12
-                                SelectionMerge 702 None
-                                BranchConditional 700 701 702
-             701:                 Label
-             703:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             704:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 705 705 12 12
-             706:    138(ptr)     AccessChain 126(id) 12
-             707:      7(int)     Load 706
-             708:   165(bool)     UGreaterThan 707 12
-                                  SelectionMerge 710 None
-                                  BranchConditional 708 709 710
-             709:                   Label
-             711:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             712:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 713 713 12 12
-             717:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 715 714(a) 47
-             718:      7(int)       Load 140(index)
-             719:      7(int)       ISub 718 39
-             720:    228(ptr)       AccessChain 200 202 719 202
-             721:   72(fvec4)       Load 720
-             722:   19(fvec3)       VectorShuffle 721 721 0 1 2
-             723:   19(fvec3)       Load 259(pos)
-             724:   19(fvec3)       FSub 722 723
-                                    Store 714(a) 724
-             725:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 726 726 12 12
-             730:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 728 727(b) 47
-             731:      7(int)       Load 140(index)
-             732:    147(ptr)       AccessChain 102(params) 146 12
-             733:     74(int)       Load 732
-             734:      7(int)       Bitcast 733
-             735:      7(int)       ISub 731 734
-             736:      7(int)       ISub 735 39
-             737:    228(ptr)       AccessChain 200 202 736 202
-             738:   72(fvec4)       Load 737
-             739:   19(fvec3)       VectorShuffle 738 738 0 1 2
-             740:   19(fvec3)       Load 259(pos)
-             741:   19(fvec3)       FSub 739 740
-                                    Store 727(b) 741
-             742:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 743 743 12 12
-             747:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 745 744(c) 47
-             748:      7(int)       Load 140(index)
-             749:    147(ptr)       AccessChain 102(params) 146 12
-             750:     74(int)       Load 749
-             751:      7(int)       Bitcast 750
-             752:      7(int)       ISub 748 751
-             753:    228(ptr)       AccessChain 200 202 752 202
-             754:   72(fvec4)       Load 753
-             755:   19(fvec3)       VectorShuffle 754 754 0 1 2
-             756:   19(fvec3)       Load 259(pos)
-             757:   19(fvec3)       FSub 755 756
-                                    Store 744(c) 757
-             758:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 759 759 12 12
-             760:   19(fvec3)       Load 714(a)
-             761:   19(fvec3)       Load 727(b)
-             762:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 760 761
-             763:   19(fvec3)       Load 727(b)
-             764:   19(fvec3)       Load 744(c)
-             765:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 763 764
-             766:   19(fvec3)       FAdd 762 765
-             767:   19(fvec3)       Load 692(normal)
-             768:   19(fvec3)       FAdd 767 766
-                                    Store 692(normal) 768
-                                    Branch 710
-             710:                 Label
-             769:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             770:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 771 771 12 12
-             772:    138(ptr)     AccessChain 126(id) 12
-             773:      7(int)     Load 772
-             774:    147(ptr)     AccessChain 102(params) 146 12
-             775:     74(int)     Load 774
-             776:     74(int)     ISub 775 236
-             777:      7(int)     Bitcast 776
-             778:   165(bool)     ULessThan 773 777
-                                  SelectionMerge 780 None
-                                  BranchConditional 778 779 780
-             779:                   Label
-             781:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             782:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 783 783 12 12
-             784:      7(int)       Load 140(index)
-             785:    147(ptr)       AccessChain 102(params) 146 12
-             786:     74(int)       Load 785
-             787:      7(int)       Bitcast 786
-             788:      7(int)       ISub 784 787
-             789:    228(ptr)       AccessChain 200 202 788 202
-             790:   72(fvec4)       Load 789
-             791:   19(fvec3)       VectorShuffle 790 790 0 1 2
-             792:   19(fvec3)       Load 259(pos)
-             793:   19(fvec3)       FSub 791 792
-                                    Store 714(a) 793
-             794:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 795 795 12 12
-             796:      7(int)       Load 140(index)
-             797:    147(ptr)       AccessChain 102(params) 146 12
-             798:     74(int)       Load 797
-             799:      7(int)       Bitcast 798
-             800:      7(int)       ISub 796 799
-             801:      7(int)       IAdd 800 39
-             802:    228(ptr)       AccessChain 200 202 801 202
-             803:   72(fvec4)       Load 802
-             804:   19(fvec3)       VectorShuffle 803 803 0 1 2
-             805:   19(fvec3)       Load 259(pos)
-             806:   19(fvec3)       FSub 804 805
-                                    Store 727(b) 806
-             807:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 808 808 12 12
-             809:      7(int)       Load 140(index)
-             810:      7(int)       IAdd 809 39
-             811:    228(ptr)       AccessChain 200 202 810 202
-             812:   72(fvec4)       Load 811
-             813:   19(fvec3)       VectorShuffle 812 812 0 1 2
-             814:   19(fvec3)       Load 259(pos)
-             815:   19(fvec3)       FSub 813 814
-                                    Store 744(c) 815
-             816:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 817 817 12 12
-             818:   19(fvec3)       Load 714(a)
-             819:   19(fvec3)       Load 727(b)
-             820:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 818 819
-             821:   19(fvec3)       Load 727(b)
-             822:   19(fvec3)       Load 744(c)
-             823:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 821 822
-             824:   19(fvec3)       FAdd 820 823
-             825:   19(fvec3)       Load 692(normal)
-             826:   19(fvec3)       FAdd 825 824
-                                    Store 692(normal) 826
-                                    Branch 780
-             780:                 Label
-                                  Branch 702
-             702:               Label
-             827:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             828:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 829 829 12 12
-             830:    138(ptr)   AccessChain 126(id) 39
-             831:      7(int)   Load 830
-             832:    147(ptr)   AccessChain 102(params) 146 39
-             833:     74(int)   Load 832
-             834:     74(int)   ISub 833 236
-             835:      7(int)   Bitcast 834
-             836:   165(bool)   ULessThan 831 835
-                                SelectionMerge 838 None
-                                BranchConditional 836 837 838
-             837:                 Label
-             839:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             840:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 841 841 12 12
-             842:    138(ptr)     AccessChain 126(id) 12
-             843:      7(int)     Load 842
-             844:   165(bool)     UGreaterThan 843 12
-                                  SelectionMerge 846 None
-                                  BranchConditional 844 845 846
-             845:                   Label
-             847:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             848:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 849 849 12 12
-             850:      7(int)       Load 140(index)
-             851:    147(ptr)       AccessChain 102(params) 146 12
-             852:     74(int)       Load 851
-             853:      7(int)       Bitcast 852
-             854:      7(int)       IAdd 850 853
-             855:    228(ptr)       AccessChain 200 202 854 202
-             856:   72(fvec4)       Load 855
-             857:   19(fvec3)       VectorShuffle 856 856 0 1 2
-             858:   19(fvec3)       Load 259(pos)
-             859:   19(fvec3)       FSub 857 858
-                                    Store 714(a) 859
-             860:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 861 861 12 12
-             862:      7(int)       Load 140(index)
-             863:    147(ptr)       AccessChain 102(params) 146 12
-             864:     74(int)       Load 863
-             865:      7(int)       Bitcast 864
-             866:      7(int)       IAdd 862 865
-             867:      7(int)       ISub 866 39
-             868:    228(ptr)       AccessChain 200 202 867 202
-             869:   72(fvec4)       Load 868
-             870:   19(fvec3)       VectorShuffle 869 869 0 1 2
-             871:   19(fvec3)       Load 259(pos)
-             872:   19(fvec3)       FSub 870 871
-                                    Store 727(b) 872
-             873:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 874 874 12 12
-             875:      7(int)       Load 140(index)
-             876:      7(int)       ISub 875 39
-             877:    228(ptr)       AccessChain 200 202 876 202
-             878:   72(fvec4)       Load 877
-             879:   19(fvec3)       VectorShuffle 878 878 0 1 2
-             880:   19(fvec3)       Load 259(pos)
-             881:   19(fvec3)       FSub 879 880
-                                    Store 744(c) 881
-             882:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 883 883 12 12
-             884:   19(fvec3)       Load 714(a)
-             885:   19(fvec3)       Load 727(b)
-             886:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 884 885
-             887:   19(fvec3)       Load 727(b)
-             888:   19(fvec3)       Load 744(c)
-             889:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 887 888
-             890:   19(fvec3)       FAdd 886 889
-             891:   19(fvec3)       Load 692(normal)
-             892:   19(fvec3)       FAdd 891 890
-                                    Store 692(normal) 892
-                                    Branch 846
-             846:                 Label
-             893:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             894:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 895 895 12 12
-             896:    138(ptr)     AccessChain 126(id) 12
-             897:      7(int)     Load 896
-             898:    147(ptr)     AccessChain 102(params) 146 12
-             899:     74(int)     Load 898
-             900:     74(int)     ISub 899 236
-             901:      7(int)     Bitcast 900
-             902:   165(bool)     ULessThan 897 901
-                                  SelectionMerge 904 None
-                                  BranchConditional 902 903 904
-             903:                   Label
-             905:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             906:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 907 907 12 12
-             908:      7(int)       Load 140(index)
-             909:      7(int)       IAdd 908 39
-             910:    228(ptr)       AccessChain 200 202 909 202
-             911:   72(fvec4)       Load 910
-             912:   19(fvec3)       VectorShuffle 911 911 0 1 2
-             913:   19(fvec3)       Load 259(pos)
-             914:   19(fvec3)       FSub 912 913
-                                    Store 714(a) 914
-             915:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 916 916 12 12
-             917:      7(int)       Load 140(index)
-             918:    147(ptr)       AccessChain 102(params) 146 12
-             919:     74(int)       Load 918
-             920:      7(int)       Bitcast 919
-             921:      7(int)       IAdd 917 920
-             922:      7(int)       IAdd 921 39
-             923:    228(ptr)       AccessChain 200 202 922 202
-             924:   72(fvec4)       Load 923
-             925:   19(fvec3)       VectorShuffle 924 924 0 1 2
-             926:   19(fvec3)       Load 259(pos)
-             927:   19(fvec3)       FSub 925 926
-                                    Store 727(b) 927
-             928:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 929 929 12 12
-             930:      7(int)       Load 140(index)
-             931:    147(ptr)       AccessChain 102(params) 146 12
-             932:     74(int)       Load 931
-             933:      7(int)       Bitcast 932
-             934:      7(int)       IAdd 930 933
-             935:    228(ptr)       AccessChain 200 202 934 202
-             936:   72(fvec4)       Load 935
-             937:   19(fvec3)       VectorShuffle 936 936 0 1 2
-             938:   19(fvec3)       Load 259(pos)
-             939:   19(fvec3)       FSub 937 938
-                                    Store 744(c) 939
-             940:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 941 941 12 12
-             942:   19(fvec3)       Load 714(a)
-             943:   19(fvec3)       Load 727(b)
-             944:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 942 943
-             945:   19(fvec3)       Load 727(b)
-             946:   19(fvec3)       Load 744(c)
-             947:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 945 946
-             948:   19(fvec3)       FAdd 944 947
-             949:   19(fvec3)       Load 692(normal)
-             950:   19(fvec3)       FAdd 949 948
-                                    Store 692(normal) 950
-                                    Branch 904
-             904:                 Label
-                                  Branch 838
-             838:               Label
-             951:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
-             952:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 953 953 12 12
-             954:      7(int)   Load 140(index)
-             955:   19(fvec3)   Load 692(normal)
-             956:   19(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 955
-             957:   16(float)   CompositeExtract 956 0
-             958:   16(float)   CompositeExtract 956 1
-             959:   16(float)   CompositeExtract 956 2
-             960:   72(fvec4)   CompositeConstruct 957 958 959 237
-             961:    228(ptr)   AccessChain 224 202 954 559
-                                Store 961 960
-                                Branch 688
-             688:             Label
+             593:   19(fvec3) FAdd 588 592
+             595:   19(fvec3) Load 574(f)
+             596:   19(fvec3) VectorTimesScalar 595 594
+             597:    105(ptr) AccessChain 101(params) 202
+             598:   16(float) Load 597
+             599:   19(fvec3) VectorTimesScalar 596 598
+             600:    105(ptr) AccessChain 101(params) 202
+             601:   16(float) Load 600
+             602:   19(fvec3) VectorTimesScalar 599 601
+             603:   19(fvec3) FAdd 593 602
+             604:   16(float) CompositeExtract 603 0
+             605:   16(float) CompositeExtract 603 1
+             606:   16(float) CompositeExtract 603 2
+             607:   71(fvec4) CompositeConstruct 604 605 606 209
+             608:    230(ptr) AccessChain 224 202 585 202
+                              Store 608 607
+             610:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 611 611 12 12
+             609:      7(int) Load 139(index)
+             612:   19(fvec3) Load 270(vel)
+             613:   19(fvec3) Load 574(f)
+             614:    105(ptr) AccessChain 101(params) 202
+             615:   16(float) Load 614
+             616:   19(fvec3) VectorTimesScalar 613 615
+             617:   19(fvec3) FAdd 612 616
+             618:   16(float) CompositeExtract 617 0
+             619:   16(float) CompositeExtract 617 1
+             620:   16(float) CompositeExtract 617 2
+             621:   71(fvec4) CompositeConstruct 618 619 620 239
+             622:    230(ptr) AccessChain 224 202 609 238
+                              Store 622 621
+             628:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 626 626 12 12
+             627:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 624 623(sphereDist) 45
+             629:      7(int) Load 139(index)
+             630:    230(ptr) AccessChain 224 202 629 202
+             631:   71(fvec4) Load 630
+             632:   19(fvec3) VectorShuffle 631 631 0 1 2
+             634:    230(ptr) AccessChain 101(params) 633
+             635:   71(fvec4) Load 634
+             636:   19(fvec3) VectorShuffle 635 635 0 1 2
+             637:   19(fvec3) FSub 632 636
+                              Store 623(sphereDist) 637
+             639:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 640 640 12 12
+             638:   19(fvec3) Load 623(sphereDist)
+             641:   16(float) ExtInst 3(GLSL.std.450) 66(Length) 638
+             643:    105(ptr) AccessChain 101(params) 642
+             644:   16(float) Load 643
+             646:   16(float) FAdd 644 645
+             647:   166(bool) FOrdLessThan 641 646
+                              SelectionMerge 649 None
+                              BranchConditional 647 648 649
+             648:               Label
+             651:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             652:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 653 653 12 12
+             650:      7(int)   Load 139(index)
+             654:    230(ptr)   AccessChain 101(params) 633
+             655:   71(fvec4)   Load 654
+             656:   19(fvec3)   VectorShuffle 655 655 0 1 2
+             657:   19(fvec3)   Load 623(sphereDist)
+             658:   19(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 657
+             659:    105(ptr)   AccessChain 101(params) 642
+             660:   16(float)   Load 659
+             661:   16(float)   FAdd 660 645
+             662:   19(fvec3)   VectorTimesScalar 658 661
+             663:   19(fvec3)   FAdd 656 662
+             664:    105(ptr)   AccessChain 224 202 650 202 12
+             665:   16(float)   CompositeExtract 663 0
+                                Store 664 665
+             666:    105(ptr)   AccessChain 224 202 650 202 39
+             667:   16(float)   CompositeExtract 663 1
+                                Store 666 667
+             668:    105(ptr)   AccessChain 224 202 650 202 41
+             669:   16(float)   CompositeExtract 663 2
+                                Store 668 669
+             671:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 672 672 12 12
+             670:      7(int)   Load 139(index)
+             673:    230(ptr)   AccessChain 224 202 670 238
+                                Store 673 240
+                                Branch 649
+             649:             Label
+             690:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             691:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 680 680 12 12
+             689:    687(ptr) AccessChain 684(pushConsts) 202
+             692:      7(int) Load 689
+             693:   166(bool) IEqual 692 39
+                              SelectionMerge 695 None
+                              BranchConditional 693 694 695
+             694:               Label
+             700:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             701:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 698 698 12 12
+             699:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 697 696(normal) 45
+                                Store 696(normal) 702
+             704:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 705 705 12 12
+             703:    137(ptr)   AccessChain 125(id) 39
+             706:      7(int)   Load 703
+             707:   166(bool)   UGreaterThan 706 12
+                                SelectionMerge 709 None
+                                BranchConditional 707 708 709
+             708:                 Label
+             711:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             712:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 713 713 12 12
+             710:    137(ptr)     AccessChain 125(id) 12
+             714:      7(int)     Load 710
+             715:   166(bool)     UGreaterThan 714 12
+                                  SelectionMerge 717 None
+                                  BranchConditional 715 716 717
+             716:                   Label
+             723:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             724:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 721 721 12 12
+             722:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 719 718(a) 45
+             725:      7(int)       Load 139(index)
+             726:      7(int)       ISub 725 39
+             727:    230(ptr)       AccessChain 200 202 726 202
+             728:   71(fvec4)       Load 727
+             729:   19(fvec3)       VectorShuffle 728 728 0 1 2
+             730:   19(fvec3)       Load 260(pos)
+             731:   19(fvec3)       FSub 729 730
+                                    Store 718(a) 731
+             737:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 735 735 12 12
+             736:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 733 732(b) 45
+             738:      7(int)       Load 139(index)
+             739:    148(ptr)       AccessChain 101(params) 147 12
+             740:     73(int)       Load 739
+             741:      7(int)       Bitcast 740
+             742:      7(int)       ISub 738 741
+             743:      7(int)       ISub 742 39
+             744:    230(ptr)       AccessChain 200 202 743 202
+             745:   71(fvec4)       Load 744
+             746:   19(fvec3)       VectorShuffle 745 745 0 1 2
+             747:   19(fvec3)       Load 260(pos)
+             748:   19(fvec3)       FSub 746 747
+                                    Store 732(b) 748
+             754:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 752 752 12 12
+             753:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 750 749(c) 45
+             755:      7(int)       Load 139(index)
+             756:    148(ptr)       AccessChain 101(params) 147 12
+             757:     73(int)       Load 756
+             758:      7(int)       Bitcast 757
+             759:      7(int)       ISub 755 758
+             760:    230(ptr)       AccessChain 200 202 759 202
+             761:   71(fvec4)       Load 760
+             762:   19(fvec3)       VectorShuffle 761 761 0 1 2
+             763:   19(fvec3)       Load 260(pos)
+             764:   19(fvec3)       FSub 762 763
+                                    Store 749(c) 764
+             766:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 767 767 12 12
+             765:   19(fvec3)       Load 718(a)
+             768:   19(fvec3)       Load 732(b)
+             769:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 765 768
+             770:   19(fvec3)       Load 732(b)
+             771:   19(fvec3)       Load 749(c)
+             772:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 770 771
+             773:   19(fvec3)       FAdd 769 772
+             774:   19(fvec3)       Load 696(normal)
+             775:   19(fvec3)       FAdd 774 773
+                                    Store 696(normal) 775
+                                    Branch 717
+             717:                 Label
+             777:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             778:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 779 779 12 12
+             776:    137(ptr)     AccessChain 125(id) 12
+             780:      7(int)     Load 776
+             781:    148(ptr)     AccessChain 101(params) 147 12
+             782:     73(int)     Load 781
+             783:     73(int)     ISub 782 238
+             784:      7(int)     Bitcast 783
+             785:   166(bool)     ULessThan 780 784
+                                  SelectionMerge 787 None
+                                  BranchConditional 785 786 787
+             786:                   Label
+             789:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             790:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 791 791 12 12
+             788:      7(int)       Load 139(index)
+             792:    148(ptr)       AccessChain 101(params) 147 12
+             793:     73(int)       Load 792
+             794:      7(int)       Bitcast 793
+             795:      7(int)       ISub 788 794
+             796:    230(ptr)       AccessChain 200 202 795 202
+             797:   71(fvec4)       Load 796
+             798:   19(fvec3)       VectorShuffle 797 797 0 1 2
+             799:   19(fvec3)       Load 260(pos)
+             800:   19(fvec3)       FSub 798 799
+                                    Store 718(a) 800
+             802:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 803 803 12 12
+             801:      7(int)       Load 139(index)
+             804:    148(ptr)       AccessChain 101(params) 147 12
+             805:     73(int)       Load 804
+             806:      7(int)       Bitcast 805
+             807:      7(int)       ISub 801 806
+             808:      7(int)       IAdd 807 39
+             809:    230(ptr)       AccessChain 200 202 808 202
+             810:   71(fvec4)       Load 809
+             811:   19(fvec3)       VectorShuffle 810 810 0 1 2
+             812:   19(fvec3)       Load 260(pos)
+             813:   19(fvec3)       FSub 811 812
+                                    Store 732(b) 813
+             815:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 816 816 12 12
+             814:      7(int)       Load 139(index)
+             817:      7(int)       IAdd 814 39
+             818:    230(ptr)       AccessChain 200 202 817 202
+             819:   71(fvec4)       Load 818
+             820:   19(fvec3)       VectorShuffle 819 819 0 1 2
+             821:   19(fvec3)       Load 260(pos)
+             822:   19(fvec3)       FSub 820 821
+                                    Store 749(c) 822
+             824:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 825 825 12 12
+             823:   19(fvec3)       Load 718(a)
+             826:   19(fvec3)       Load 732(b)
+             827:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 823 826
+             828:   19(fvec3)       Load 732(b)
+             829:   19(fvec3)       Load 749(c)
+             830:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 828 829
+             831:   19(fvec3)       FAdd 827 830
+             832:   19(fvec3)       Load 696(normal)
+             833:   19(fvec3)       FAdd 832 831
+                                    Store 696(normal) 833
+                                    Branch 787
+             787:                 Label
+             834:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+                                  Branch 709
+             709:               Label
+             836:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             837:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 838 838 12 12
+             835:    137(ptr)   AccessChain 125(id) 39
+             839:      7(int)   Load 835
+             840:    148(ptr)   AccessChain 101(params) 147 39
+             841:     73(int)   Load 840
+             842:     73(int)   ISub 841 238
+             843:      7(int)   Bitcast 842
+             844:   166(bool)   ULessThan 839 843
+                                SelectionMerge 846 None
+                                BranchConditional 844 845 846
+             845:                 Label
+             848:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             849:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 850 850 12 12
+             847:    137(ptr)     AccessChain 125(id) 12
+             851:      7(int)     Load 847
+             852:   166(bool)     UGreaterThan 851 12
+                                  SelectionMerge 854 None
+                                  BranchConditional 852 853 854
+             853:                   Label
+             856:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             857:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 858 858 12 12
+             855:      7(int)       Load 139(index)
+             859:    148(ptr)       AccessChain 101(params) 147 12
+             860:     73(int)       Load 859
+             861:      7(int)       Bitcast 860
+             862:      7(int)       IAdd 855 861
+             863:    230(ptr)       AccessChain 200 202 862 202
+             864:   71(fvec4)       Load 863
+             865:   19(fvec3)       VectorShuffle 864 864 0 1 2
+             866:   19(fvec3)       Load 260(pos)
+             867:   19(fvec3)       FSub 865 866
+                                    Store 718(a) 867
+             869:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 870 870 12 12
+             868:      7(int)       Load 139(index)
+             871:    148(ptr)       AccessChain 101(params) 147 12
+             872:     73(int)       Load 871
+             873:      7(int)       Bitcast 872
+             874:      7(int)       IAdd 868 873
+             875:      7(int)       ISub 874 39
+             876:    230(ptr)       AccessChain 200 202 875 202
+             877:   71(fvec4)       Load 876
+             878:   19(fvec3)       VectorShuffle 877 877 0 1 2
+             879:   19(fvec3)       Load 260(pos)
+             880:   19(fvec3)       FSub 878 879
+                                    Store 732(b) 880
+             882:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 883 883 12 12
+             881:      7(int)       Load 139(index)
+             884:      7(int)       ISub 881 39
+             885:    230(ptr)       AccessChain 200 202 884 202
+             886:   71(fvec4)       Load 885
+             887:   19(fvec3)       VectorShuffle 886 886 0 1 2
+             888:   19(fvec3)       Load 260(pos)
+             889:   19(fvec3)       FSub 887 888
+                                    Store 749(c) 889
+             891:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 892 892 12 12
+             890:   19(fvec3)       Load 718(a)
+             893:   19(fvec3)       Load 732(b)
+             894:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 890 893
+             895:   19(fvec3)       Load 732(b)
+             896:   19(fvec3)       Load 749(c)
+             897:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 895 896
+             898:   19(fvec3)       FAdd 894 897
+             899:   19(fvec3)       Load 696(normal)
+             900:   19(fvec3)       FAdd 899 898
+                                    Store 696(normal) 900
+                                    Branch 854
+             854:                 Label
+             902:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             903:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 904 904 12 12
+             901:    137(ptr)     AccessChain 125(id) 12
+             905:      7(int)     Load 901
+             906:    148(ptr)     AccessChain 101(params) 147 12
+             907:     73(int)     Load 906
+             908:     73(int)     ISub 907 238
+             909:      7(int)     Bitcast 908
+             910:   166(bool)     ULessThan 905 909
+                                  SelectionMerge 912 None
+                                  BranchConditional 910 911 912
+             911:                   Label
+             914:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             915:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 916 916 12 12
+             913:      7(int)       Load 139(index)
+             917:      7(int)       IAdd 913 39
+             918:    230(ptr)       AccessChain 200 202 917 202
+             919:   71(fvec4)       Load 918
+             920:   19(fvec3)       VectorShuffle 919 919 0 1 2
+             921:   19(fvec3)       Load 260(pos)
+             922:   19(fvec3)       FSub 920 921
+                                    Store 718(a) 922
+             924:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 925 925 12 12
+             923:      7(int)       Load 139(index)
+             926:    148(ptr)       AccessChain 101(params) 147 12
+             927:     73(int)       Load 926
+             928:      7(int)       Bitcast 927
+             929:      7(int)       IAdd 923 928
+             930:      7(int)       IAdd 929 39
+             931:    230(ptr)       AccessChain 200 202 930 202
+             932:   71(fvec4)       Load 931
+             933:   19(fvec3)       VectorShuffle 932 932 0 1 2
+             934:   19(fvec3)       Load 260(pos)
+             935:   19(fvec3)       FSub 933 934
+                                    Store 732(b) 935
+             937:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 938 938 12 12
+             936:      7(int)       Load 139(index)
+             939:    148(ptr)       AccessChain 101(params) 147 12
+             940:     73(int)       Load 939
+             941:      7(int)       Bitcast 940
+             942:      7(int)       IAdd 936 941
+             943:    230(ptr)       AccessChain 200 202 942 202
+             944:   71(fvec4)       Load 943
+             945:   19(fvec3)       VectorShuffle 944 944 0 1 2
+             946:   19(fvec3)       Load 260(pos)
+             947:   19(fvec3)       FSub 945 946
+                                    Store 749(c) 947
+             949:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 950 950 12 12
+             948:   19(fvec3)       Load 718(a)
+             951:   19(fvec3)       Load 732(b)
+             952:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 948 951
+             953:   19(fvec3)       Load 732(b)
+             954:   19(fvec3)       Load 749(c)
+             955:   19(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 953 954
+             956:   19(fvec3)       FAdd 952 955
+             957:   19(fvec3)       Load 696(normal)
+             958:   19(fvec3)       FAdd 957 956
+                                    Store 696(normal) 958
+                                    Branch 912
+             912:                 Label
+             959:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+                                  Branch 846
+             846:               Label
+             961:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
+             962:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 963 963 12 12
+             960:      7(int)   Load 139(index)
+             964:   19(fvec3)   Load 696(normal)
+             965:   19(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 964
+             966:   16(float)   CompositeExtract 965 0
+             967:   16(float)   CompositeExtract 965 1
+             968:   16(float)   CompositeExtract 965 2
+             969:   71(fvec4)   CompositeConstruct 966 967 968 239
+             970:    230(ptr)   AccessChain 224 202 960 563
+                                Store 970 969
+                                Branch 695
+             695:             Label
+             971:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 55
                               Return
                               FunctionEnd
-                              Line 1 66 50
 31(springForce(vf3;vf3;f1;):   19(fvec3) Function None 26
           28(p0):     21(ptr) FunctionParameter
           29(p1):     21(ptr) FunctionParameter
     30(restDist):     24(ptr) FunctionParameter
               32:             Label
-        61(dist):     21(ptr) Variable Function
-              42:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 37 37 12 12
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 44 28(p0) 47
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 48 29(p1) 47
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 51 30(restDist) 47
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 34 31(springForce(vf3;vf3;f1;)
-              58:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 60 60 12 12
-              64:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 62 61(dist) 47
-              65:   19(fvec3) Load 28(p0)
-              66:   19(fvec3) Load 29(p1)
-              67:   19(fvec3) FSub 65 66
-                              Store 61(dist) 67
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 69 69 12 12
-              70:   19(fvec3) Load 61(dist)
-              71:   19(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 70
-             108:    106(ptr) AccessChain 102(params) 105
-             109:   16(float) Load 108
-             110:   19(fvec3) VectorTimesScalar 71 109
-             111:   19(fvec3) Load 61(dist)
-             112:   16(float) ExtInst 3(GLSL.std.450) 66(Length) 111
-             113:   16(float) Load 30(restDist)
-             114:   16(float) FSub 112 113
-             115:   19(fvec3) VectorTimesScalar 110 114
-                              ReturnValue 115
+        58(dist):     21(ptr) Variable Function
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 34
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 37 37 12 12
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 42 28(p0) 45
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 48 29(p1) 45
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 51 30(restDist) 45
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 34 31(springForce(vf3;vf3;f1;)
+              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 61 61 12 12
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 59 58(dist) 45
+              64:   19(fvec3) Load 28(p0)
+              65:   19(fvec3) Load 29(p1)
+              66:   19(fvec3) FSub 64 65
+                              Store 58(dist) 66
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 35 69 69 12 12
+              67:   19(fvec3) Load 58(dist)
+              70:   19(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 67
+             107:    105(ptr) AccessChain 101(params) 104
+             108:   16(float) Load 107
+             109:   19(fvec3) VectorTimesScalar 70 108
+             110:   19(fvec3) Load 58(dist)
+             111:   16(float) ExtInst 3(GLSL.std.450) 66(Length) 110
+             112:   16(float) Load 30(restDist)
+             113:   16(float) FSub 111 112
+             114:   19(fvec3) VectorTimesScalar 109 113
+                              ReturnValue 114
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.frag.out b/Test/baseResults/spv.debuginfo.glsl.frag.out
index 2c7bac82..e747bc13 100644
--- a/Test/baseResults/spv.debuginfo.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.glsl.frag.out
@@ -1,17 +1,18 @@
 spv.debuginfo.glsl.frag
+Validation failed
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 870
+// Id's are bound by 881
 
                               Capability Shader
                               Capability ImageQuery
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 14  "main" 488 544
+                              EntryPoint Fragment 14  "main" 493 546
                               ExecutionMode 14 OriginUpperLeft
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               17:             String  "float"
               39:             String  "textureProj"
@@ -23,66 +24,66 @@ spv.debuginfo.glsl.frag
 // OpModuleProcessed entry-point main
 #line 1
 "
-              49:             String  "P"
+              47:             String  "P"
               53:             String  "layer"
               56:             String  "offset"
               64:             String  "filterPCF"
-              70:             String  "sc"
-              84:             String  "shadow"
-              90:             String  "fragcolor"
-              93:             String  "fragpos"
-              95:             String  "main"
-             102:             String  "int"
-             108:             String  "global_var"
-             123:             String  "shadowCoord"
-             145:             String  "bool"
-             166:             String  "dist"
-             170:             String  "type.2d.image"
-             171:             String  "@type.2d.image"
-             175:             String  "type.sampled.image"
-             176:             String  "@type.sampled.image"
-             181:             String  "samplerShadowMap"
-             230:             String  "texDim"
-             242:             String  "scale"
-             249:             String  "dx"
-             263:             String  "dy"
-             275:             String  "shadowFactor"
-             281:             String  "count"
-             287:             String  "range"
-             294:             String  "x"
-             315:             String  "y"
-             378:             String  "i"
+              68:             String  "sc"
+              83:             String  "shadow"
+              87:             String  "fragcolor"
+              91:             String  "fragpos"
+              93:             String  "main"
+              97:             String  "int"
+             103:             String  "global_var"
+             118:             String  "shadowCoord"
+             140:             String  "bool"
+             161:             String  "dist"
+             168:             String  "type.2d.image"
+             169:             String  "@type.2d.image"
+             173:             String  "type.sampled.image"
+             174:             String  "@type.sampled.image"
+             179:             String  "samplerShadowMap"
+             229:             String  "texDim"
+             241:             String  "scale"
+             248:             String  "dx"
+             262:             String  "dy"
+             274:             String  "shadowFactor"
+             280:             String  "count"
+             286:             String  "range"
+             293:             String  "x"
+             313:             String  "y"
+             379:             String  "i"
              397:             String  "shadowClip"
-             404:             String  "color"
-             409:             String  "viewMatrix"
-             412:             String  "Light"
-             418:             String  "lights"
-             421:             String  "debugDisplayTarget"
-             425:             String  "UBO"
-             430:             String  "ubo"
-             474:             String  "fragPos"
-             484:             String  "samplerposition"
-             490:             String  "inUV"
-             498:             String  "normal"
-             502:             String  "samplerNormal"
-             511:             String  "albedo"
-             515:             String  "samplerAlbedo"
-             546:             String  "outFragColor"
-             639:             String  "N"
-             664:             String  "L"
-             689:             String  "V"
-             704:             String  "lightCosInnerAngle"
-             711:             String  "lightCosOuterAngle"
-             718:             String  "lightRange"
-             725:             String  "dir"
-             741:             String  "cosDir"
-             750:             String  "spotEffect"
-             760:             String  "heightAttenuation"
-             769:             String  "NdotL"
-             779:             String  "diff"
-             787:             String  "R"
-             797:             String  "NdotR"
-             807:             String  "spec"
+             407:             String  "color"
+             412:             String  "viewMatrix"
+             415:             String  "Light"
+             421:             String  "lights"
+             424:             String  "debugDisplayTarget"
+             428:             String  "UBO"
+             433:             String  "ubo"
+             477:             String  "fragPos"
+             489:             String  "samplerposition"
+             495:             String  "inUV"
+             501:             String  "normal"
+             507:             String  "samplerNormal"
+             514:             String  "albedo"
+             520:             String  "samplerAlbedo"
+             548:             String  "outFragColor"
+             648:             String  "N"
+             672:             String  "L"
+             698:             String  "V"
+             713:             String  "lightCosInnerAngle"
+             720:             String  "lightCosOuterAngle"
+             727:             String  "lightRange"
+             734:             String  "dir"
+             750:             String  "cosDir"
+             759:             String  "spotEffect"
+             769:             String  "heightAttenuation"
+             778:             String  "NdotL"
+             788:             String  "diff"
+             796:             String  "R"
+             806:             String  "NdotR"
+             816:             String  "spec"
                               Name 14  "main"
                               Name 37  "textureProj(vf4;f1;vf2;"
                               Name 34  "P"
@@ -91,1025 +92,1023 @@ spv.debuginfo.glsl.frag
                               Name 62  "filterPCF(vf4;f1;"
                               Name 60  "sc"
                               Name 61  "layer"
-                              Name 82  "shadow(vf3;vf3;"
-                              Name 80  "fragcolor"
-                              Name 81  "fragpos"
-                              Name 106  "global_var"
-                              Name 115  "shadow"
-                              Name 121  "shadowCoord"
-                              Name 164  "dist"
-                              Name 179  "samplerShadowMap"
-                              Name 228  "texDim"
-                              Name 240  "scale"
-                              Name 247  "dx"
-                              Name 261  "dy"
-                              Name 273  "shadowFactor"
-                              Name 279  "count"
-                              Name 285  "range"
-                              Name 292  "x"
-                              Name 313  "y"
-                              Name 343  "param"
-                              Name 345  "param"
-                              Name 347  "param"
-                              Name 376  "i"
+                              Name 81  "shadow(vf3;vf3;"
+                              Name 79  "fragcolor"
+                              Name 80  "fragpos"
+                              Name 101  "global_var"
+                              Name 110  "shadow"
+                              Name 116  "shadowCoord"
+                              Name 159  "dist"
+                              Name 177  "samplerShadowMap"
+                              Name 227  "texDim"
+                              Name 239  "scale"
+                              Name 246  "dx"
+                              Name 260  "dy"
+                              Name 272  "shadowFactor"
+                              Name 278  "count"
+                              Name 284  "range"
+                              Name 291  "x"
+                              Name 311  "y"
+                              Name 344  "param"
+                              Name 346  "param"
+                              Name 348  "param"
+                              Name 377  "i"
                               Name 395  "shadowClip"
-                              Name 402  "Light"
-                              MemberName 402(Light) 0  "position"
-                              MemberName 402(Light) 1  "target"
-                              MemberName 402(Light) 2  "color"
-                              MemberName 402(Light) 3  "viewMatrix"
-                              Name 415  "UBO"
-                              MemberName 415(UBO) 0  "viewPos"
-                              MemberName 415(UBO) 1  "lights"
-                              MemberName 415(UBO) 2  "useShadows"
-                              MemberName 415(UBO) 3  "debugDisplayTarget"
-                              Name 428  "ubo"
-                              Name 444  "shadowFactor"
-                              Name 449  "param"
-                              Name 451  "param"
-                              Name 472  "fragPos"
-                              Name 482  "samplerposition"
-                              Name 488  "inUV"
-                              Name 496  "normal"
-                              Name 500  "samplerNormal"
-                              Name 509  "albedo"
-                              Name 513  "samplerAlbedo"
-                              Name 544  "outFragColor"
-                              Name 548  "param"
-                              Name 549  "param"
-                              Name 628  "fragcolor"
-                              Name 637  "N"
-                              Name 645  "i"
-                              Name 662  "L"
-                              Name 676  "dist"
-                              Name 687  "V"
-                              Name 702  "lightCosInnerAngle"
-                              Name 709  "lightCosOuterAngle"
-                              Name 716  "lightRange"
-                              Name 723  "dir"
-                              Name 739  "cosDir"
-                              Name 748  "spotEffect"
-                              Name 758  "heightAttenuation"
-                              Name 767  "NdotL"
-                              Name 777  "diff"
-                              Name 785  "R"
-                              Name 795  "NdotR"
-                              Name 805  "spec"
-                              Name 857  "param"
-                              Name 859  "param"
-                              Decorate 179(samplerShadowMap) DescriptorSet 0
-                              Decorate 179(samplerShadowMap) Binding 5
-                              MemberDecorate 402(Light) 0 Offset 0
-                              MemberDecorate 402(Light) 1 Offset 16
-                              MemberDecorate 402(Light) 2 Offset 32
-                              MemberDecorate 402(Light) 3 ColMajor
-                              MemberDecorate 402(Light) 3 Offset 48
-                              MemberDecorate 402(Light) 3 MatrixStride 16
-                              Decorate 413 ArrayStride 112
-                              MemberDecorate 415(UBO) 0 Offset 0
-                              MemberDecorate 415(UBO) 1 Offset 16
-                              MemberDecorate 415(UBO) 2 Offset 352
-                              MemberDecorate 415(UBO) 3 Offset 356
-                              Decorate 415(UBO) Block
-                              Decorate 428(ubo) DescriptorSet 0
-                              Decorate 428(ubo) Binding 4
-                              Decorate 482(samplerposition) DescriptorSet 0
-                              Decorate 482(samplerposition) Binding 1
-                              Decorate 488(inUV) Location 0
-                              Decorate 500(samplerNormal) DescriptorSet 0
-                              Decorate 500(samplerNormal) Binding 2
-                              Decorate 513(samplerAlbedo) DescriptorSet 0
-                              Decorate 513(samplerAlbedo) Binding 3
-                              Decorate 544(outFragColor) Location 0
+                              Name 405  "Light"
+                              MemberName 405(Light) 0  "position"
+                              MemberName 405(Light) 1  "target"
+                              MemberName 405(Light) 2  "color"
+                              MemberName 405(Light) 3  "viewMatrix"
+                              Name 418  "UBO"
+                              MemberName 418(UBO) 0  "viewPos"
+                              MemberName 418(UBO) 1  "lights"
+                              MemberName 418(UBO) 2  "useShadows"
+                              MemberName 418(UBO) 3  "debugDisplayTarget"
+                              Name 431  "ubo"
+                              Name 445  "shadowFactor"
+                              Name 452  "param"
+                              Name 454  "param"
+                              Name 475  "fragPos"
+                              Name 487  "samplerposition"
+                              Name 493  "inUV"
+                              Name 499  "normal"
+                              Name 505  "samplerNormal"
+                              Name 512  "albedo"
+                              Name 518  "samplerAlbedo"
+                              Name 546  "outFragColor"
+                              Name 551  "param"
+                              Name 554  "param"
+                              Name 636  "fragcolor"
+                              Name 646  "N"
+                              Name 654  "i"
+                              Name 670  "L"
+                              Name 685  "dist"
+                              Name 696  "V"
+                              Name 711  "lightCosInnerAngle"
+                              Name 718  "lightCosOuterAngle"
+                              Name 725  "lightRange"
+                              Name 732  "dir"
+                              Name 748  "cosDir"
+                              Name 757  "spotEffect"
+                              Name 767  "heightAttenuation"
+                              Name 776  "NdotL"
+                              Name 786  "diff"
+                              Name 794  "R"
+                              Name 804  "NdotR"
+                              Name 814  "spec"
+                              Name 865  "param"
+                              Name 870  "param"
+                              Decorate 177(samplerShadowMap) DescriptorSet 0
+                              Decorate 177(samplerShadowMap) Binding 5
+                              MemberDecorate 405(Light) 0 Offset 0
+                              MemberDecorate 405(Light) 1 Offset 16
+                              MemberDecorate 405(Light) 2 Offset 32
+                              MemberDecorate 405(Light) 3 ColMajor
+                              MemberDecorate 405(Light) 3 Offset 48
+                              MemberDecorate 405(Light) 3 MatrixStride 16
+                              Decorate 416 ArrayStride 112
+                              MemberDecorate 418(UBO) 0 Offset 0
+                              MemberDecorate 418(UBO) 1 Offset 16
+                              MemberDecorate 418(UBO) 2 Offset 352
+                              MemberDecorate 418(UBO) 3 Offset 356
+                              Decorate 418(UBO) Block
+                              Decorate 431(ubo) DescriptorSet 0
+                              Decorate 431(ubo) Binding 4
+                              Decorate 487(samplerposition) DescriptorSet 0
+                              Decorate 487(samplerposition) Binding 1
+                              Decorate 493(inUV) Location 0
+                              Decorate 505(samplerNormal) DescriptorSet 0
+                              Decorate 505(samplerNormal) Binding 2
+                              Decorate 518(samplerAlbedo) DescriptorSet 0
+                              Decorate 518(samplerAlbedo) Binding 3
+                              Decorate 546(outFragColor) Location 0
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
               16:             TypeFloat 32
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
               19:             TypeVector 16(float) 4
               20:      7(int) Constant 4
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
               22:             TypePointer Function 19(fvec4)
               23:      7(int) Constant 7
-              24:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 23 12
+              24:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 23 12
               25:             TypePointer Function 16(float)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 23 12
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 23 12
               27:             TypeVector 16(float) 2
               28:      7(int) Constant 2
-              29:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 28
+              29:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 28
               30:             TypePointer Function 27(fvec2)
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 23 12
+              31:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 23 12
               32:             TypeFunction 16(float) 22(ptr) 25(ptr) 30(ptr)
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 18 29
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 42
+              33:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 18 29
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 42
               43:      7(int) Constant 59
               45:      7(int) Constant 1
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 45 20 41 28
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 39 33 41 43 12 44 39 13 43
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 21 41 43 12 40 20 45
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 18 41 43 12 40 20 28
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 56 29 41 43 12 40 20 13
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 45 20 41 28
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 39 33 41 43 12 44 39 13 43
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 47 21 41 43 12 40 20 45
+              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 18 41 43 12 40 20 28
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 56 29 41 43 12 40 20 13
               58:             TypeFunction 16(float) 22(ptr) 25(ptr)
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 18
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 18
               66:      7(int) Constant 76
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 64 59 41 66 12 44 64 13 66
-              69:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 70 21 41 66 12 65 20 45
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 18 41 66 12 65 20 28
-              74:             TypeVector 16(float) 3
-              75:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
-              76:             TypePointer Function 74(fvec3)
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 75 23 12
-              78:             TypeFunction 74(fvec3) 76(ptr) 76(ptr)
-              79:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 75 75 75
-              86:      7(int) Constant 99
-              85:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 84 79 41 86 12 44 84 13 86
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 90 75 41 86 12 85 20 45
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 93 75 41 86 12 85 20 28
-              97:      7(int) Constant 116
-              96:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 95 6 41 97 12 44 95 13 97
-             100:      7(int) Constant 41
-             101:             TypeInt 32 1
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 102 10 20 12
-             104:             TypePointer Private 101(int)
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 103 11 12
- 106(global_var):    104(ptr) Variable Private
-             109:      7(int) Constant 8
-             107:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 108 103 41 100 12 44 108 106(global_var) 109
-             110:    101(int) Constant 0
-             114:      7(int) Constant 61
-             116:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 84 18 41 114 12 40 20
-             118:   16(float) Constant 1065353216
-             120:      7(int) Constant 62
-             122:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 123 21 41 120 12 40 20
-             131:      7(int) Constant 63
-             134:   16(float) Constant 1056964608
-             143:      7(int) Constant 65
-             144:             TypeBool
-             146:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 145 10 28 12
-             149:   16(float) Constant 3212836864
-             163:      7(int) Constant 67
-             165:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 166 18 41 163 12 40 20
-             168:             TypeImage 16(float) 2D array sampled format:Unknown
-             172:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             169:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 170 12 41 163 12 44 171 172 13
-             173:             TypeSampledImage 168
-             174:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 12 41 163 12 44 176 172 13
-             177:             TypePointer UniformConstant 173
-             178:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 174 12 12
-179(samplerShadowMap):    177(ptr) Variable UniformConstant
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 181 174 41 163 12 44 181 179(samplerShadowMap) 109
-             194:      7(int) Constant 68
-             197:   16(float) Constant 0
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 64 59 41 66 12 44 64 13 66
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 68 21 41 66 12 65 20 45
+              71:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 18 41 66 12 65 20 28
+              73:             TypeVector 16(float) 3
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
+              75:             TypePointer Function 73(fvec3)
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 74 23 12
+              77:             TypeFunction 73(fvec3) 75(ptr) 75(ptr)
+              78:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 74 74 74
+              85:      7(int) Constant 99
+              84:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 83 78 41 85 12 44 83 13 85
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 74 41 85 12 84 20 45
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 91 74 41 85 12 84 20 28
+              95:      7(int) Constant 116
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 93 6 41 95 12 44 93 13 95
+              96:             TypeInt 32 1
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 97 10 20 12
+              99:             TypePointer Private 96(int)
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 11 12
+ 101(global_var):     99(ptr) Variable Private
+             104:      7(int) Constant 41
+             105:      7(int) Constant 8
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 103 98 41 104 12 44 103 101(global_var) 105
+             106:     96(int) Constant 0
+             112:      7(int) Constant 61
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 83 18 41 112 12 40 20
+             115:   16(float) Constant 1065353216
+             119:      7(int) Constant 62
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 118 21 41 119 12 40 20
+             129:      7(int) Constant 63
+             131:   16(float) Constant 1056964608
+             139:             TypeBool
+             141:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 140 10 28 12
+             144:      7(int) Constant 65
+             146:   16(float) Constant 3212836864
+             162:      7(int) Constant 67
+             160:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 161 18 41 162 12 40 20
+             166:             TypeImage 16(float) 2D array sampled format:Unknown
+             170:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             167:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 168 12 41 162 12 44 169 170 13
+             171:             TypeSampledImage 166
+             172:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 173 12 41 162 12 44 174 170 13
+             175:             TypePointer UniformConstant 171
+             176:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 172 12 12
+177(samplerShadowMap):    175(ptr) Variable UniformConstant
+             178:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 179 172 41 162 12 44 179 177(samplerShadowMap) 105
+             193:      7(int) Constant 68
+             195:   16(float) Constant 0
+             209:   16(float) Constant 1048576000
              212:      7(int) Constant 70
-             213:   16(float) Constant 1048576000
-             216:      7(int) Constant 73
-             223:      7(int) Constant 78
-             224:             TypeVector 101(int) 2
-             225:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 103 28
-             226:             TypePointer Function 224(ivec2)
-             227:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 225 23 12
-             229:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 230 225 41 223 12 65 20
-             234:             TypeVector 101(int) 3
-             235:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 103 13
-             239:      7(int) Constant 79
-             241:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 242 18 41 239 12 65 20
-             244:   16(float) Constant 1069547520
-             246:      7(int) Constant 80
-             248:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 249 18 41 246 12 65 20
-             253:             TypePointer Function 101(int)
-             254:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 103 23 12
-             260:      7(int) Constant 81
-             262:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 263 18 41 260 12 65 20
-             272:      7(int) Constant 83
-             274:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 275 18 41 272 12 65 20
-             278:      7(int) Constant 84
-             280:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 281 103 41 278 12 65 20
-             284:      7(int) Constant 85
-             286:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 287 103 41 284 12 65 20
-             289:    101(int) Constant 1
-             291:      7(int) Constant 87
-             293:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 294 103 41 291 12 65 20
-             312:      7(int) Constant 89
-             314:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 315 103 41 312 12 65 20
-             333:      7(int) Constant 91
-             352:      7(int) Constant 92
-             365:      7(int) Constant 96
-             375:      7(int) Constant 100
-             377:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 378 103 41 375 12 85 20
-             390:    101(int) Constant 3
-             394:      7(int) Constant 102
-             396:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 397 21 41 394 12 85 20
-             399:             TypeMatrix 19(fvec4) 4
-             401:   144(bool) ConstantTrue
-             400:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 21 20 401
-      402(Light):             TypeStruct 19(fvec4) 19(fvec4) 19(fvec4) 399
-             405:      7(int) Constant 47
-             403:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 404 21 41 405 23 12 12 13
-             406:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 404 21 41 405 23 12 12 13
-             407:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 404 21 41 405 23 12 12 13
-             410:      7(int) Constant 48
-             408:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 409 400 41 410 23 12 12 13
-             411:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 412 45 41 394 12 44 412 12 13 403 406 407 408
-             413:             TypeArray 402(Light) 13
-             414:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 411 13
-        415(UBO):             TypeStruct 19(fvec4) 413 101(int) 101(int)
-             416:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 404 21 41 405 23 12 12 13
-             419:      7(int) Constant 54
-             417:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 418 414 41 419 109 12 12 13
-             422:      7(int) Constant 56
-             420:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 421 103 41 422 11 12 12 13
-             423:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 421 103 41 422 11 12 12 13
-             424:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 425 45 41 394 12 44 425 12 13 416 417 420 423
-             426:             TypePointer Uniform 415(UBO)
-             427:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 424 28 12
-        428(ubo):    426(ptr) Variable Uniform
-             429:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 430 424 41 394 12 44 430 428(ubo) 109
-             432:             TypePointer Uniform 399
-             433:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 400 28 12
-             443:      7(int) Constant 106
-             445:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 275 18 41 443 12 85 20
-             454:      7(int) Constant 111
-             464:      7(int) Constant 113
-             471:      7(int) Constant 119
-             473:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 474 75 41 471 12 96 20
-             476:             TypeImage 16(float) 2D sampled format:Unknown
-             477:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 170 12 41 471 12 44 171 172 13
-             478:             TypeSampledImage 476
-             479:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 12 41 471 12 44 176 172 13
-             480:             TypePointer UniformConstant 478
-             481:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 479 12 12
-482(samplerposition):    480(ptr) Variable UniformConstant
-             483:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 484 479 41 471 12 44 484 482(samplerposition) 109
-             486:             TypePointer Input 27(fvec2)
-             487:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 45 12
-       488(inUV):    486(ptr) Variable Input
-             489:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 490 29 41 471 12 44 490 488(inUV) 109
-             495:      7(int) Constant 120
-             497:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 498 75 41 495 12 96 20
-500(samplerNormal):    480(ptr) Variable UniformConstant
-             501:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 502 479 41 495 12 44 502 500(samplerNormal) 109
-             508:      7(int) Constant 121
-             510:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 511 21 41 508 12 96 20
-513(samplerAlbedo):    480(ptr) Variable UniformConstant
-             514:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 515 479 41 508 12 44 515 513(samplerAlbedo) 109
-             520:      7(int) Constant 124
-             521:             TypePointer Uniform 101(int)
-             522:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 103 28 12
-             530:      7(int) Constant 125
-             541:      7(int) Constant 127
-             542:             TypePointer Output 19(fvec4)
-             543:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
-544(outFragColor):    542(ptr) Variable Output
-             545:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 546 21 41 541 12 44 546 544(outFragColor) 109
-             547:   74(fvec3) ConstantComposite 118 118 118
-             552:             TypePointer Output 16(float)
-             553:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
-             561:      7(int) Constant 128
-             565:      7(int) Constant 130
-             574:      7(int) Constant 131
-             578:      7(int) Constant 133
-             587:      7(int) Constant 134
-             591:      7(int) Constant 136
-             601:      7(int) Constant 137
-             605:      7(int) Constant 139
-             615:      7(int) Constant 140
-             620:      7(int) Constant 142
-             623:      7(int) Constant 143
-             627:      7(int) Constant 147
-             629:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 90 75 41 627 12 96 20
-             633:   16(float) Constant 1036831949
-             636:      7(int) Constant 149
-             638:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 639 75 41 636 12 96 20
-             644:      7(int) Constant 151
-             646:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 378 103 41 644 12 96 20
-             661:      7(int) Constant 154
-             663:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 664 75 41 661 12 96 20
-             667:             TypePointer Uniform 19(fvec4)
-             668:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 28 12
-             675:      7(int) Constant 156
-             677:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 166 18 41 675 12 96 20
-             682:      7(int) Constant 157
-             686:      7(int) Constant 160
-             688:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 689 75 41 686 12 96 20
-             697:      7(int) Constant 161
-             701:      7(int) Constant 163
-             703:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 704 18 41 701 12 96 20
-             706:   16(float) Constant 1064781546
-             708:      7(int) Constant 164
-             710:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 711 18 41 708 12 96 20
-             713:   16(float) Constant 1063781322
-             715:      7(int) Constant 165
-             717:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 718 18 41 715 12 96 20
-             720:   16(float) Constant 1120403456
-             722:      7(int) Constant 168
-             724:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 725 75 41 722 12 96 20
-             738:      7(int) Constant 171
-             740:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 741 18 41 738 12 96 20
-             747:      7(int) Constant 172
-             749:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 750 18 41 747 12 96 20
-             757:      7(int) Constant 173
-             759:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 760 18 41 757 12 96 20
-             766:      7(int) Constant 176
-             768:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 769 18 41 766 12 96 20
-             776:      7(int) Constant 177
-             778:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 779 75 41 776 12 96 20
-             784:      7(int) Constant 180
-             786:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 787 75 41 784 12 96 20
-             794:      7(int) Constant 181
-             796:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 797 18 41 794 12 96 20
-             804:      7(int) Constant 182
-             806:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 807 75 41 804 12 96 20
-             810:   16(float) Constant 1098907648
-             815:   16(float) Constant 1075838976
-             819:      7(int) Constant 184
-             832:    101(int) Constant 2
-             848:      7(int) Constant 188
-             856:      7(int) Constant 190
-             864:      7(int) Constant 193
-                              Line 1 116 11
+             217:      7(int) Constant 73
+             223:             TypeVector 96(int) 2
+             224:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 98 28
+             225:             TypePointer Function 223(ivec2)
+             226:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 224 23 12
+             230:      7(int) Constant 78
+             228:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 229 224 41 230 12 65 20
+             235:             TypeVector 96(int) 3
+             236:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 98 13
+             242:      7(int) Constant 79
+             240:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 241 18 41 242 12 65 20
+             245:   16(float) Constant 1069547520
+             249:      7(int) Constant 80
+             247:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 248 18 41 249 12 65 20
+             254:             TypePointer Function 96(int)
+             255:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 23 12
+             263:      7(int) Constant 81
+             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 262 18 41 263 12 65 20
+             275:      7(int) Constant 83
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 274 18 41 275 12 65 20
+             281:      7(int) Constant 84
+             279:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 280 98 41 281 12 65 20
+             287:      7(int) Constant 85
+             285:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 286 98 41 287 12 65 20
+             290:     96(int) Constant 1
+             294:      7(int) Constant 87
+             292:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 293 98 41 294 12 65 20
+             314:      7(int) Constant 89
+             312:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 313 98 41 314 12 65 20
+             335:      7(int) Constant 91
+             354:      7(int) Constant 92
+             368:      7(int) Constant 96
+             380:      7(int) Constant 100
+             378:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 379 98 41 380 12 84 20
+             393:     96(int) Constant 3
+             398:      7(int) Constant 102
+             396:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 397 21 41 398 12 84 20
+             402:             TypeMatrix 19(fvec4) 4
+             404:   139(bool) ConstantTrue
+             403:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 21 20 404
+      405(Light):             TypeStruct 19(fvec4) 19(fvec4) 19(fvec4) 402
+             408:      7(int) Constant 47
+             406:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 407 21 41 408 23 12 12 13
+             409:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 407 21 41 408 23 12 12 13
+             410:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 407 21 41 408 23 12 12 13
+             413:      7(int) Constant 48
+             411:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 412 403 41 413 23 12 12 13
+             414:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 415 45 41 398 12 44 415 12 13 406 409 410 411
+             416:             TypeArray 405(Light) 13
+             417:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 414 13
+        418(UBO):             TypeStruct 19(fvec4) 416 96(int) 96(int)
+             419:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 407 21 41 408 23 12 12 13
+             422:      7(int) Constant 54
+             420:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 421 417 41 422 105 12 12 13
+             425:      7(int) Constant 56
+             423:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 424 98 41 425 11 12 12 13
+             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 424 98 41 425 11 12 12 13
+             427:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 428 45 41 398 12 44 428 12 13 419 420 423 426
+             429:             TypePointer Uniform 418(UBO)
+             430:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 427 28 12
+        431(ubo):    429(ptr) Variable Uniform
+             432:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 433 427 41 398 12 44 433 431(ubo) 105
+             435:             TypePointer Uniform 402
+             436:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 403 28 12
+             447:      7(int) Constant 106
+             446:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 274 18 41 447 12 84 20
+             458:      7(int) Constant 111
+             468:      7(int) Constant 113
+             478:      7(int) Constant 119
+             476:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 477 74 41 478 12 94 20
+             481:             TypeImage 16(float) 2D sampled format:Unknown
+             482:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 168 12 41 478 12 44 169 170 13
+             483:             TypeSampledImage 481
+             484:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 173 12 41 478 12 44 174 170 13
+             485:             TypePointer UniformConstant 483
+             486:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 484 12 12
+487(samplerposition):    485(ptr) Variable UniformConstant
+             488:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 489 484 41 478 12 44 489 487(samplerposition) 105
+             491:             TypePointer Input 27(fvec2)
+             492:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 29 45 12
+       493(inUV):    491(ptr) Variable Input
+             494:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 495 29 41 478 12 44 495 493(inUV) 105
+             502:      7(int) Constant 120
+             500:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 501 74 41 502 12 94 20
+505(samplerNormal):    485(ptr) Variable UniformConstant
+             506:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 507 484 41 502 12 44 507 505(samplerNormal) 105
+             515:      7(int) Constant 121
+             513:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 514 21 41 515 12 94 20
+518(samplerAlbedo):    485(ptr) Variable UniformConstant
+             519:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 520 484 41 515 12 44 520 518(samplerAlbedo) 105
+             524:             TypePointer Uniform 96(int)
+             525:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 28 12
+             528:      7(int) Constant 124
+             536:      7(int) Constant 125
+             544:             TypePointer Output 19(fvec4)
+             545:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
+546(outFragColor):    544(ptr) Variable Output
+             549:      7(int) Constant 127
+             547:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 548 21 41 549 12 44 548 546(outFragColor) 105
+             550:   73(fvec3) ConstantComposite 115 115 115
+             557:             TypePointer Output 16(float)
+             558:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
+             566:      7(int) Constant 128
+             572:      7(int) Constant 130
+             580:      7(int) Constant 131
+             586:      7(int) Constant 133
+             594:      7(int) Constant 134
+             600:      7(int) Constant 136
+             609:      7(int) Constant 137
+             615:      7(int) Constant 139
+             624:      7(int) Constant 140
+             631:      7(int) Constant 142
+             633:      7(int) Constant 143
+             638:      7(int) Constant 147
+             637:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 74 41 638 12 94 20
+             644:   16(float) Constant 1036831949
+             649:      7(int) Constant 149
+             647:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 648 74 41 649 12 94 20
+             656:      7(int) Constant 151
+             655:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 379 98 41 656 12 94 20
+             673:      7(int) Constant 154
+             671:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 672 74 41 673 12 94 20
+             678:             TypePointer Uniform 19(fvec4)
+             679:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 28 12
+             687:      7(int) Constant 156
+             686:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 161 18 41 687 12 94 20
+             694:      7(int) Constant 157
+             699:      7(int) Constant 160
+             697:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 698 74 41 699 12 94 20
+             709:      7(int) Constant 161
+             714:      7(int) Constant 163
+             712:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 713 18 41 714 12 94 20
+             717:   16(float) Constant 1064781546
+             721:      7(int) Constant 164
+             719:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 720 18 41 721 12 94 20
+             724:   16(float) Constant 1063781322
+             728:      7(int) Constant 165
+             726:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 727 18 41 728 12 94 20
+             731:   16(float) Constant 1120403456
+             735:      7(int) Constant 168
+             733:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 734 74 41 735 12 94 20
+             751:      7(int) Constant 171
+             749:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 750 18 41 751 12 94 20
+             760:      7(int) Constant 172
+             758:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 759 18 41 760 12 94 20
+             770:      7(int) Constant 173
+             768:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 769 18 41 770 12 94 20
+             779:      7(int) Constant 176
+             777:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 778 18 41 779 12 94 20
+             789:      7(int) Constant 177
+             787:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 788 74 41 789 12 94 20
+             797:      7(int) Constant 180
+             795:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 796 74 41 797 12 94 20
+             807:      7(int) Constant 181
+             805:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 806 18 41 807 12 94 20
+             817:      7(int) Constant 182
+             815:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 816 74 41 817 12 94 20
+             821:   16(float) Constant 1098907648
+             826:   16(float) Constant 1075838976
+             831:      7(int) Constant 184
+             843:     96(int) Constant 2
+             860:      7(int) Constant 188
+             869:      7(int) Constant 190
+             876:      7(int) Constant 193
         14(main):           4 Function None 5
               15:             Label
-    472(fragPos):     76(ptr) Variable Function
-     496(normal):     76(ptr) Variable Function
-     509(albedo):     22(ptr) Variable Function
-      548(param):     76(ptr) Variable Function
-      549(param):     76(ptr) Variable Function
-  628(fragcolor):     76(ptr) Variable Function
-          637(N):     76(ptr) Variable Function
-          645(i):    253(ptr) Variable Function
-          662(L):     76(ptr) Variable Function
-       676(dist):     25(ptr) Variable Function
-          687(V):     76(ptr) Variable Function
-702(lightCosInnerAngle):     25(ptr) Variable Function
-709(lightCosOuterAngle):     25(ptr) Variable Function
- 716(lightRange):     25(ptr) Variable Function
-        723(dir):     76(ptr) Variable Function
-     739(cosDir):     25(ptr) Variable Function
- 748(spotEffect):     25(ptr) Variable Function
-758(heightAttenuation):     25(ptr) Variable Function
-      767(NdotL):     25(ptr) Variable Function
-       777(diff):     76(ptr) Variable Function
-          785(R):     76(ptr) Variable Function
-      795(NdotR):     25(ptr) Variable Function
-       805(spec):     76(ptr) Variable Function
-      857(param):     76(ptr) Variable Function
-      859(param):     76(ptr) Variable Function
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 100 100 12 12
-                              Store 106(global_var) 110
-             468:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 96 14(main)
-             469:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             470:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 471 471 12 12
-             475:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 473 472(fragPos) 51
-             485:         478 Load 482(samplerposition)
-             491:   27(fvec2) Load 488(inUV)
-             492:   19(fvec4) ImageSampleImplicitLod 485 491
-             493:   74(fvec3) VectorShuffle 492 492 0 1 2
-                              Store 472(fragPos) 493
-             494:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 495 495 12 12
-             499:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 497 496(normal) 51
-             503:         478 Load 500(samplerNormal)
-             504:   27(fvec2) Load 488(inUV)
-             505:   19(fvec4) ImageSampleImplicitLod 503 504
-             506:   74(fvec3) VectorShuffle 505 505 0 1 2
-                              Store 496(normal) 506
-             507:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 508 508 12 12
-             512:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 510 509(albedo) 51
-             516:         478 Load 513(samplerAlbedo)
-             517:   27(fvec2) Load 488(inUV)
-             518:   19(fvec4) ImageSampleImplicitLod 516 517
-                              Store 509(albedo) 518
-             519:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 520 520 12 12
-             523:    521(ptr) AccessChain 428(ubo) 390
-             524:    101(int) Load 523
-             525:   144(bool) SGreaterThan 524 110
-                              SelectionMerge 527 None
-                              BranchConditional 525 526 527
-             526:               Label
-             528:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             529:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 530 530 12 12
-             531:    521(ptr)   AccessChain 428(ubo) 390
-             532:    101(int)   Load 531
-                                SelectionMerge 538 None
-                                Switch 532 538 
-                                       case 1: 533
-                                       case 2: 534
-                                       case 3: 535
-                                       case 4: 536
-                                       case 5: 537
-             533:                 Label
-             539:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             540:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 541 541 12 12
-                                  Store 548(param) 547
-             550:   74(fvec3)     Load 472(fragPos)
-                                  Store 549(param) 550
-             551:   74(fvec3)     FunctionCall 82(shadow(vf3;vf3;) 548(param) 549(param)
-             554:    552(ptr)     AccessChain 544(outFragColor) 12
-             555:   16(float)     CompositeExtract 551 0
-                                  Store 554 555
-             556:    552(ptr)     AccessChain 544(outFragColor) 45
-             557:   16(float)     CompositeExtract 551 1
-                                  Store 556 557
-             558:    552(ptr)     AccessChain 544(outFragColor) 28
-             559:   16(float)     CompositeExtract 551 2
-                                  Store 558 559
-             560:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 561 561 12 12
-                                  Branch 538
-             534:                 Label
-             563:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             564:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 565 565 12 12
-             566:   74(fvec3)     Load 472(fragPos)
-             567:    552(ptr)     AccessChain 544(outFragColor) 12
-             568:   16(float)     CompositeExtract 566 0
-                                  Store 567 568
-             569:    552(ptr)     AccessChain 544(outFragColor) 45
-             570:   16(float)     CompositeExtract 566 1
-                                  Store 569 570
-             571:    552(ptr)     AccessChain 544(outFragColor) 28
-             572:   16(float)     CompositeExtract 566 2
-                                  Store 571 572
-             573:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 574 574 12 12
-                                  Branch 538
-             535:                 Label
-             576:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             577:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 578 578 12 12
-             579:   74(fvec3)     Load 496(normal)
-             580:    552(ptr)     AccessChain 544(outFragColor) 12
-             581:   16(float)     CompositeExtract 579 0
-                                  Store 580 581
-             582:    552(ptr)     AccessChain 544(outFragColor) 45
-             583:   16(float)     CompositeExtract 579 1
-                                  Store 582 583
-             584:    552(ptr)     AccessChain 544(outFragColor) 28
-             585:   16(float)     CompositeExtract 579 2
-                                  Store 584 585
-             586:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 587 587 12 12
-                                  Branch 538
-             536:                 Label
-             589:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             590:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 591 591 12 12
-             592:   19(fvec4)     Load 509(albedo)
-             593:   74(fvec3)     VectorShuffle 592 592 0 1 2
-             594:    552(ptr)     AccessChain 544(outFragColor) 12
-             595:   16(float)     CompositeExtract 593 0
-                                  Store 594 595
-             596:    552(ptr)     AccessChain 544(outFragColor) 45
-             597:   16(float)     CompositeExtract 593 1
-                                  Store 596 597
-             598:    552(ptr)     AccessChain 544(outFragColor) 28
-             599:   16(float)     CompositeExtract 593 2
-                                  Store 598 599
-             600:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 601 601 12 12
-                                  Branch 538
-             537:                 Label
-             603:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             604:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 605 605 12 12
-             606:   19(fvec4)     Load 509(albedo)
-             607:   74(fvec3)     VectorShuffle 606 606 3 3 3
-             608:    552(ptr)     AccessChain 544(outFragColor) 12
-             609:   16(float)     CompositeExtract 607 0
-                                  Store 608 609
-             610:    552(ptr)     AccessChain 544(outFragColor) 45
-             611:   16(float)     CompositeExtract 607 1
-                                  Store 610 611
-             612:    552(ptr)     AccessChain 544(outFragColor) 28
-             613:   16(float)     CompositeExtract 607 2
-                                  Store 612 613
-             614:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 615 615 12 12
-                                  Branch 538
-             538:               Label
-             618:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             619:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 620 620 12 12
-             621:    552(ptr)   AccessChain 544(outFragColor) 13
-                                Store 621 118
-             622:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 623 623 12 12
+    475(fragPos):     75(ptr) Variable Function
+     499(normal):     75(ptr) Variable Function
+     512(albedo):     22(ptr) Variable Function
+      551(param):     75(ptr) Variable Function
+      554(param):     75(ptr) Variable Function
+  636(fragcolor):     75(ptr) Variable Function
+          646(N):     75(ptr) Variable Function
+          654(i):    254(ptr) Variable Function
+          670(L):     75(ptr) Variable Function
+       685(dist):     25(ptr) Variable Function
+          696(V):     75(ptr) Variable Function
+711(lightCosInnerAngle):     25(ptr) Variable Function
+718(lightCosOuterAngle):     25(ptr) Variable Function
+ 725(lightRange):     25(ptr) Variable Function
+        732(dir):     75(ptr) Variable Function
+     748(cosDir):     25(ptr) Variable Function
+ 757(spotEffect):     25(ptr) Variable Function
+767(heightAttenuation):     25(ptr) Variable Function
+      776(NdotL):     25(ptr) Variable Function
+       786(diff):     75(ptr) Variable Function
+          794(R):     75(ptr) Variable Function
+      804(NdotR):     25(ptr) Variable Function
+       814(spec):     75(ptr) Variable Function
+      865(param):     75(ptr) Variable Function
+      870(param):     75(ptr) Variable Function
+             107:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 44
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 104 104 12 12
+                              Store 101(global_var) 106
+             473:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             474:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 95 95 12 12
+             472:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 94 14(main)
+             480:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 478 478 12 12
+             479:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 476 475(fragPos) 49
+             490:         483 Load 487(samplerposition)
+             496:   27(fvec2) Load 493(inUV)
+             497:   19(fvec4) ImageSampleImplicitLod 490 496
+             498:   73(fvec3) VectorShuffle 497 497 0 1 2
+                              Store 475(fragPos) 498
+             504:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 502 502 12 12
+             503:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 500 499(normal) 49
+             508:         483 Load 505(samplerNormal)
+             509:   27(fvec2) Load 493(inUV)
+             510:   19(fvec4) ImageSampleImplicitLod 508 509
+             511:   73(fvec3) VectorShuffle 510 510 0 1 2
+                              Store 499(normal) 511
+             517:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 515 515 12 12
+             516:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 513 512(albedo) 49
+             521:         483 Load 518(samplerAlbedo)
+             522:   27(fvec2) Load 493(inUV)
+             523:   19(fvec4) ImageSampleImplicitLod 521 522
+                              Store 512(albedo) 523
+             527:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 528 528 12 12
+             526:    524(ptr) AccessChain 431(ubo) 393
+             529:     96(int) Load 526
+             530:   139(bool) SGreaterThan 529 106
+                              SelectionMerge 532 None
+                              BranchConditional 530 531 532
+             531:               Label
+             534:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             535:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 536 536 12 12
+             533:    524(ptr)   AccessChain 431(ubo) 393
+             537:     96(int)   Load 533
+                                SelectionMerge 543 None
+                                Switch 537 543 
+                                       case 1: 538
+                                       case 2: 539
+                                       case 3: 540
+                                       case 4: 541
+                                       case 5: 542
+             538:                 Label
+             552:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             553:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 549 549 12 12
+                                  Store 551(param) 550
+             555:   73(fvec3)     Load 475(fragPos)
+                                  Store 554(param) 555
+             556:   73(fvec3)     FunctionCall 81(shadow(vf3;vf3;) 551(param) 554(param)
+             559:    557(ptr)     AccessChain 546(outFragColor) 12
+             560:   16(float)     CompositeExtract 556 0
+                                  Store 559 560
+             561:    557(ptr)     AccessChain 546(outFragColor) 45
+             562:   16(float)     CompositeExtract 556 1
+                                  Store 561 562
+             563:    557(ptr)     AccessChain 546(outFragColor) 28
+             564:   16(float)     CompositeExtract 556 2
+                                  Store 563 564
+             565:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 566 566 12 12
+                                  Branch 543
+             539:                 Label
+             570:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             571:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 572 572 12 12
+             569:   73(fvec3)     Load 475(fragPos)
+             573:    557(ptr)     AccessChain 546(outFragColor) 12
+             574:   16(float)     CompositeExtract 569 0
+                                  Store 573 574
+             575:    557(ptr)     AccessChain 546(outFragColor) 45
+             576:   16(float)     CompositeExtract 569 1
+                                  Store 575 576
+             577:    557(ptr)     AccessChain 546(outFragColor) 28
+             578:   16(float)     CompositeExtract 569 2
+                                  Store 577 578
+             579:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 580 580 12 12
+                                  Branch 543
+             540:                 Label
+             584:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             585:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 586 586 12 12
+             583:   73(fvec3)     Load 499(normal)
+             587:    557(ptr)     AccessChain 546(outFragColor) 12
+             588:   16(float)     CompositeExtract 583 0
+                                  Store 587 588
+             589:    557(ptr)     AccessChain 546(outFragColor) 45
+             590:   16(float)     CompositeExtract 583 1
+                                  Store 589 590
+             591:    557(ptr)     AccessChain 546(outFragColor) 28
+             592:   16(float)     CompositeExtract 583 2
+                                  Store 591 592
+             593:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 594 594 12 12
+                                  Branch 543
+             541:                 Label
+             598:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             599:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 600 600 12 12
+             597:   19(fvec4)     Load 512(albedo)
+             601:   73(fvec3)     VectorShuffle 597 597 0 1 2
+             602:    557(ptr)     AccessChain 546(outFragColor) 12
+             603:   16(float)     CompositeExtract 601 0
+                                  Store 602 603
+             604:    557(ptr)     AccessChain 546(outFragColor) 45
+             605:   16(float)     CompositeExtract 601 1
+                                  Store 604 605
+             606:    557(ptr)     AccessChain 546(outFragColor) 28
+             607:   16(float)     CompositeExtract 601 2
+                                  Store 606 607
+             608:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 609 609 12 12
+                                  Branch 543
+             542:                 Label
+             613:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             614:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 615 615 12 12
+             612:   19(fvec4)     Load 512(albedo)
+             616:   73(fvec3)     VectorShuffle 612 612 3 3 3
+             617:    557(ptr)     AccessChain 546(outFragColor) 12
+             618:   16(float)     CompositeExtract 616 0
+                                  Store 617 618
+             619:    557(ptr)     AccessChain 546(outFragColor) 45
+             620:   16(float)     CompositeExtract 616 1
+                                  Store 619 620
+             621:    557(ptr)     AccessChain 546(outFragColor) 28
+             622:   16(float)     CompositeExtract 616 2
+                                  Store 621 622
+             623:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 624 624 12 12
+                                  Branch 543
+             543:               Label
+             629:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             630:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 631 631 12 12
+             628:    557(ptr)   AccessChain 546(outFragColor) 13
+                                Store 628 115
+             632:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 633 633 12 12
                                 Return
-             527:             Label
-             625:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             626:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 627 627 12 12
-             630:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 629 628(fragcolor) 51
-             631:   19(fvec4) Load 509(albedo)
-             632:   74(fvec3) VectorShuffle 631 631 0 1 2
-             634:   74(fvec3) VectorTimesScalar 632 633
-                              Store 628(fragcolor) 634
-             635:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 636 636 12 12
-             640:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 638 637(N) 51
-             641:   74(fvec3) Load 496(normal)
-             642:   74(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 641
-                              Store 637(N) 642
-             643:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 644 644 12 12
-             647:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 646 645(i) 51
-                              Store 645(i) 110
-                              Branch 648
-             648:             Label
-             652:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             653:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 644 644 12 12
-                              LoopMerge 650 651 None
-                              Branch 654
-             654:             Label
-             655:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             656:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 644 644 12 12
-             657:    101(int) Load 645(i)
-             658:   144(bool) SLessThan 657 390
-                              BranchConditional 658 649 650
-             649:               Label
-             659:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             660:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 661 661 12 12
-             665:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 663 662(L) 51
-             666:    101(int)   Load 645(i)
-             669:    667(ptr)   AccessChain 428(ubo) 289 666 110
-             670:   19(fvec4)   Load 669
-             671:   74(fvec3)   VectorShuffle 670 670 0 1 2
-             672:   74(fvec3)   Load 472(fragPos)
-             673:   74(fvec3)   FSub 671 672
-                                Store 662(L) 673
-             674:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 675 675 12 12
-             678:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 677 676(dist) 51
-             679:   74(fvec3)   Load 662(L)
-             680:   16(float)   ExtInst 3(GLSL.std.450) 66(Length) 679
-                                Store 676(dist) 680
-             681:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 682 682 12 12
-             683:   74(fvec3)   Load 662(L)
-             684:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 683
-                                Store 662(L) 684
-             685:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 686 686 12 12
-             690:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 688 687(V) 51
-             691:    667(ptr)   AccessChain 428(ubo) 110
-             692:   19(fvec4)   Load 691
-             693:   74(fvec3)   VectorShuffle 692 692 0 1 2
-             694:   74(fvec3)   Load 472(fragPos)
-             695:   74(fvec3)   FSub 693 694
-                                Store 687(V) 695
-             696:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 697 697 12 12
-             698:   74(fvec3)   Load 687(V)
-             699:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 698
-                                Store 687(V) 699
-             700:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 701 701 12 12
-             705:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 703 702(lightCosInnerAngle) 51
-                                Store 702(lightCosInnerAngle) 706
-             707:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 708 708 12 12
-             712:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 710 709(lightCosOuterAngle) 51
-                                Store 709(lightCosOuterAngle) 713
-             714:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 715 715 12 12
-             719:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 717 716(lightRange) 51
-                                Store 716(lightRange) 720
-             721:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 722 722 12 12
-             726:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 724 723(dir) 51
-             727:    101(int)   Load 645(i)
-             728:    667(ptr)   AccessChain 428(ubo) 289 727 110
-             729:   19(fvec4)   Load 728
-             730:   74(fvec3)   VectorShuffle 729 729 0 1 2
-             731:    101(int)   Load 645(i)
-             732:    667(ptr)   AccessChain 428(ubo) 289 731 289
-             733:   19(fvec4)   Load 732
-             734:   74(fvec3)   VectorShuffle 733 733 0 1 2
-             735:   74(fvec3)   FSub 730 734
-             736:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 735
-                                Store 723(dir) 736
-             737:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 738 738 12 12
-             742:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 740 739(cosDir) 51
-             743:   74(fvec3)   Load 662(L)
-             744:   74(fvec3)   Load 723(dir)
-             745:   16(float)   Dot 743 744
-                                Store 739(cosDir) 745
-             746:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 747 747 12 12
-             751:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 749 748(spotEffect) 51
-             752:   16(float)   Load 709(lightCosOuterAngle)
-             753:   16(float)   Load 702(lightCosInnerAngle)
-             754:   16(float)   Load 739(cosDir)
-             755:   16(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 752 753 754
-                                Store 748(spotEffect) 755
-             756:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 757 757 12 12
-             761:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 759 758(heightAttenuation) 51
-             762:   16(float)   Load 716(lightRange)
-             763:   16(float)   Load 676(dist)
-             764:   16(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 762 197 763
-                                Store 758(heightAttenuation) 764
-             765:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 766 766 12 12
-             770:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 768 767(NdotL) 51
-             771:   74(fvec3)   Load 637(N)
-             772:   74(fvec3)   Load 662(L)
-             773:   16(float)   Dot 771 772
-             774:   16(float)   ExtInst 3(GLSL.std.450) 40(FMax) 197 773
-                                Store 767(NdotL) 774
-             775:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 776 776 12 12
-             780:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 778 777(diff) 51
-             781:   16(float)   Load 767(NdotL)
-             782:   74(fvec3)   CompositeConstruct 781 781 781
-                                Store 777(diff) 782
-             783:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 784 784 12 12
-             788:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 786 785(R) 51
-             789:   74(fvec3)   Load 662(L)
-             790:   74(fvec3)   FNegate 789
-             791:   74(fvec3)   Load 637(N)
-             792:   74(fvec3)   ExtInst 3(GLSL.std.450) 71(Reflect) 790 791
-                                Store 785(R) 792
-             793:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 794 794 12 12
-             798:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 796 795(NdotR) 51
-             799:   74(fvec3)   Load 785(R)
-             800:   74(fvec3)   Load 687(V)
-             801:   16(float)   Dot 799 800
-             802:   16(float)   ExtInst 3(GLSL.std.450) 40(FMax) 197 801
-                                Store 795(NdotR) 802
-             803:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 804 804 12 12
-             808:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 806 805(spec) 51
-             809:   16(float)   Load 795(NdotR)
-             811:   16(float)   ExtInst 3(GLSL.std.450) 26(Pow) 809 810
-             812:     25(ptr)   AccessChain 509(albedo) 13
-             813:   16(float)   Load 812
-             814:   16(float)   FMul 811 813
-             816:   16(float)   FMul 814 815
-             817:   74(fvec3)   CompositeConstruct 816 816 816
-                                Store 805(spec) 817
-             818:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 819 819 12 12
-             820:   74(fvec3)   Load 777(diff)
-             821:   74(fvec3)   Load 805(spec)
-             822:   74(fvec3)   FAdd 820 821
-             823:   16(float)   Load 748(spotEffect)
-             824:   74(fvec3)   VectorTimesScalar 822 823
-             825:   16(float)   Load 758(heightAttenuation)
-             826:   74(fvec3)   VectorTimesScalar 824 825
-             827:   16(float)   CompositeExtract 826 0
-             828:   16(float)   CompositeExtract 826 1
-             829:   16(float)   CompositeExtract 826 2
-             830:   74(fvec3)   CompositeConstruct 827 828 829
-             831:    101(int)   Load 645(i)
-             833:    667(ptr)   AccessChain 428(ubo) 289 831 832
-             834:   19(fvec4)   Load 833
-             835:   74(fvec3)   VectorShuffle 834 834 0 1 2
-             836:   74(fvec3)   FMul 830 835
-             837:   19(fvec4)   Load 509(albedo)
-             838:   74(fvec3)   VectorShuffle 837 837 0 1 2
-             839:   74(fvec3)   FMul 836 838
-             840:   74(fvec3)   Load 628(fragcolor)
-             841:   74(fvec3)   FAdd 840 839
-                                Store 628(fragcolor) 841
-                                Branch 651
-             651:               Label
-             842:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             843:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 644 644 12 12
-             844:    101(int)   Load 645(i)
-             845:    101(int)   IAdd 844 289
-                                Store 645(i) 845
-                                Branch 648
-             650:             Label
-             846:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             847:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 848 848 12 12
-             849:    521(ptr) AccessChain 428(ubo) 832
-             850:    101(int) Load 849
-             851:   144(bool) SGreaterThan 850 110
-                              SelectionMerge 853 None
-                              BranchConditional 851 852 853
-             852:               Label
-             854:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             855:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 856 856 12 12
-             858:   74(fvec3)   Load 628(fragcolor)
-                                Store 857(param) 858
-             860:   74(fvec3)   Load 472(fragPos)
-                                Store 859(param) 860
-             861:   74(fvec3)   FunctionCall 82(shadow(vf3;vf3;) 857(param) 859(param)
-                                Store 628(fragcolor) 861
-                                Branch 853
-             853:             Label
-             862:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 96
-             863:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 864 864 12 12
-             865:   74(fvec3) Load 628(fragcolor)
-             866:   16(float) CompositeExtract 865 0
-             867:   16(float) CompositeExtract 865 1
-             868:   16(float) CompositeExtract 865 2
-             869:   19(fvec4) CompositeConstruct 866 867 868 118
-                              Store 544(outFragColor) 869
+             532:             Label
+             640:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             641:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 638 638 12 12
+             639:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 637 636(fragcolor) 49
+             642:   19(fvec4) Load 512(albedo)
+             643:   73(fvec3) VectorShuffle 642 642 0 1 2
+             645:   73(fvec3) VectorTimesScalar 643 644
+                              Store 636(fragcolor) 645
+             651:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 649 649 12 12
+             650:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 647 646(N) 49
+             652:   73(fvec3) Load 499(normal)
+             653:   73(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 652
+                              Store 646(N) 653
+             658:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 656 656 12 12
+             657:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 655 654(i) 49
+                              Store 654(i) 106
+                              Branch 659
+             659:             Label
+             663:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             664:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 656 656 12 12
+                              LoopMerge 661 662 None
+                              Branch 665
+             665:             Label
+             667:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             668:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 656 656 12 12
+             666:     96(int) Load 654(i)
+             669:   139(bool) SLessThan 666 393
+                              BranchConditional 669 660 661
+             660:               Label
+             675:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             676:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 673 673 12 12
+             674:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 671 670(L) 49
+             677:     96(int)   Load 654(i)
+             680:    678(ptr)   AccessChain 431(ubo) 290 677 106
+             681:   19(fvec4)   Load 680
+             682:   73(fvec3)   VectorShuffle 681 681 0 1 2
+             683:   73(fvec3)   Load 475(fragPos)
+             684:   73(fvec3)   FSub 682 683
+                                Store 670(L) 684
+             689:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 687 687 12 12
+             688:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 686 685(dist) 49
+             690:   73(fvec3)   Load 670(L)
+             691:   16(float)   ExtInst 3(GLSL.std.450) 66(Length) 690
+                                Store 685(dist) 691
+             693:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 694 694 12 12
+             692:   73(fvec3)   Load 670(L)
+             695:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 692
+                                Store 670(L) 695
+             701:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 699 699 12 12
+             700:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 697 696(V) 49
+             702:    678(ptr)   AccessChain 431(ubo) 106
+             703:   19(fvec4)   Load 702
+             704:   73(fvec3)   VectorShuffle 703 703 0 1 2
+             705:   73(fvec3)   Load 475(fragPos)
+             706:   73(fvec3)   FSub 704 705
+                                Store 696(V) 706
+             708:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 709 709 12 12
+             707:   73(fvec3)   Load 696(V)
+             710:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 707
+                                Store 696(V) 710
+             716:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 714 714 12 12
+             715:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 712 711(lightCosInnerAngle) 49
+                                Store 711(lightCosInnerAngle) 717
+             723:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 721 721 12 12
+             722:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 719 718(lightCosOuterAngle) 49
+                                Store 718(lightCosOuterAngle) 724
+             730:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 728 728 12 12
+             729:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 726 725(lightRange) 49
+                                Store 725(lightRange) 731
+             737:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 735 735 12 12
+             736:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 733 732(dir) 49
+             738:     96(int)   Load 654(i)
+             739:    678(ptr)   AccessChain 431(ubo) 290 738 106
+             740:   19(fvec4)   Load 739
+             741:   73(fvec3)   VectorShuffle 740 740 0 1 2
+             742:     96(int)   Load 654(i)
+             743:    678(ptr)   AccessChain 431(ubo) 290 742 290
+             744:   19(fvec4)   Load 743
+             745:   73(fvec3)   VectorShuffle 744 744 0 1 2
+             746:   73(fvec3)   FSub 741 745
+             747:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 746
+                                Store 732(dir) 747
+             753:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 751 751 12 12
+             752:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 749 748(cosDir) 49
+             754:   73(fvec3)   Load 670(L)
+             755:   73(fvec3)   Load 732(dir)
+             756:   16(float)   Dot 754 755
+                                Store 748(cosDir) 756
+             762:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 760 760 12 12
+             761:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 758 757(spotEffect) 49
+             763:   16(float)   Load 718(lightCosOuterAngle)
+             764:   16(float)   Load 711(lightCosInnerAngle)
+             765:   16(float)   Load 748(cosDir)
+             766:   16(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 763 764 765
+                                Store 757(spotEffect) 766
+             772:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 770 770 12 12
+             771:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 768 767(heightAttenuation) 49
+             773:   16(float)   Load 725(lightRange)
+             774:   16(float)   Load 685(dist)
+             775:   16(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 773 195 774
+                                Store 767(heightAttenuation) 775
+             781:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 779 779 12 12
+             780:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 777 776(NdotL) 49
+             782:   73(fvec3)   Load 646(N)
+             783:   73(fvec3)   Load 670(L)
+             784:   16(float)   Dot 782 783
+             785:   16(float)   ExtInst 3(GLSL.std.450) 40(FMax) 195 784
+                                Store 776(NdotL) 785
+             791:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 789 789 12 12
+             790:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 787 786(diff) 49
+             792:   16(float)   Load 776(NdotL)
+             793:   73(fvec3)   CompositeConstruct 792 792 792
+                                Store 786(diff) 793
+             799:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 797 797 12 12
+             798:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 795 794(R) 49
+             800:   73(fvec3)   Load 670(L)
+             801:   73(fvec3)   FNegate 800
+             802:   73(fvec3)   Load 646(N)
+             803:   73(fvec3)   ExtInst 3(GLSL.std.450) 71(Reflect) 801 802
+                                Store 794(R) 803
+             809:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 807 807 12 12
+             808:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 805 804(NdotR) 49
+             810:   73(fvec3)   Load 794(R)
+             811:   73(fvec3)   Load 696(V)
+             812:   16(float)   Dot 810 811
+             813:   16(float)   ExtInst 3(GLSL.std.450) 40(FMax) 195 812
+                                Store 804(NdotR) 813
+             819:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 817 817 12 12
+             818:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 815 814(spec) 49
+             820:   16(float)   Load 804(NdotR)
+             822:   16(float)   ExtInst 3(GLSL.std.450) 26(Pow) 820 821
+             823:     25(ptr)   AccessChain 512(albedo) 13
+             824:   16(float)   Load 823
+             825:   16(float)   FMul 822 824
+             827:   16(float)   FMul 825 826
+             828:   73(fvec3)   CompositeConstruct 827 827 827
+                                Store 814(spec) 828
+             830:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 831 831 12 12
+             829:   73(fvec3)   Load 786(diff)
+             832:   73(fvec3)   Load 814(spec)
+             833:   73(fvec3)   FAdd 829 832
+             834:   16(float)   Load 757(spotEffect)
+             835:   73(fvec3)   VectorTimesScalar 833 834
+             836:   16(float)   Load 767(heightAttenuation)
+             837:   73(fvec3)   VectorTimesScalar 835 836
+             838:   16(float)   CompositeExtract 837 0
+             839:   16(float)   CompositeExtract 837 1
+             840:   16(float)   CompositeExtract 837 2
+             841:   73(fvec3)   CompositeConstruct 838 839 840
+             842:     96(int)   Load 654(i)
+             844:    678(ptr)   AccessChain 431(ubo) 290 842 843
+             845:   19(fvec4)   Load 844
+             846:   73(fvec3)   VectorShuffle 845 845 0 1 2
+             847:   73(fvec3)   FMul 841 846
+             848:   19(fvec4)   Load 512(albedo)
+             849:   73(fvec3)   VectorShuffle 848 848 0 1 2
+             850:   73(fvec3)   FMul 847 849
+             851:   73(fvec3)   Load 636(fragcolor)
+             852:   73(fvec3)   FAdd 851 850
+                                Store 636(fragcolor) 852
+                                Branch 662
+             662:               Label
+             854:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             855:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 656 656 12 12
+             853:     96(int)   Load 654(i)
+             856:     96(int)   IAdd 853 290
+                                Store 654(i) 856
+                                Branch 659
+             661:             Label
+             858:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             859:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 860 860 12 12
+             857:    524(ptr) AccessChain 431(ubo) 843
+             861:     96(int) Load 857
+             862:   139(bool) SGreaterThan 861 106
+                              SelectionMerge 864 None
+                              BranchConditional 862 863 864
+             863:               Label
+             867:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             868:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 869 869 12 12
+             866:   73(fvec3)   Load 636(fragcolor)
+                                Store 865(param) 866
+             871:   73(fvec3)   Load 475(fragPos)
+                                Store 870(param) 871
+             872:   73(fvec3)   FunctionCall 81(shadow(vf3;vf3;) 865(param) 870(param)
+                                Store 636(fragcolor) 872
+                                Branch 864
+             864:             Label
+             874:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 94
+             875:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 876 876 12 12
+             873:   73(fvec3) Load 636(fragcolor)
+             877:   16(float) CompositeExtract 873 0
+             878:   16(float) CompositeExtract 873 1
+             879:   16(float) CompositeExtract 873 2
+             880:   19(fvec4) CompositeConstruct 877 878 879 115
+                              Store 546(outFragColor) 880
                               Return
                               FunctionEnd
-                              Line 1 59 51
 37(textureProj(vf4;f1;vf2;):   16(float) Function None 32
            34(P):     22(ptr) FunctionParameter
        35(layer):     25(ptr) FunctionParameter
       36(offset):     30(ptr) FunctionParameter
               38:             Label
-     115(shadow):     25(ptr) Variable Function
-121(shadowCoord):     22(ptr) Variable Function
-       164(dist):     25(ptr) Variable Function
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 43 43 12 12
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 48 34(P) 51
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 52 35(layer) 51
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 55 36(offset) 51
-             111:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 40 37(textureProj(vf4;f1;vf2;)
-             112:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             113:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 114 114 12 12
-             117:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 116 115(shadow) 51
-                              Store 115(shadow) 118
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 120 120 12 12
-             124:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 122 121(shadowCoord) 51
-             125:   19(fvec4) Load 34(P)
-             126:     25(ptr) AccessChain 34(P) 13
-             127:   16(float) Load 126
-             128:   19(fvec4) CompositeConstruct 127 127 127 127
-             129:   19(fvec4) FDiv 125 128
-                              Store 121(shadowCoord) 129
-             130:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 131 131 12 12
-             132:   19(fvec4) Load 121(shadowCoord)
-             133:   27(fvec2) VectorShuffle 132 132 0 1
-             135:   27(fvec2) VectorTimesScalar 133 134
-             136:   27(fvec2) CompositeConstruct 134 134
-             137:   27(fvec2) FAdd 135 136
-             138:     25(ptr) AccessChain 121(shadowCoord) 12
-             139:   16(float) CompositeExtract 137 0
-                              Store 138 139
-             140:     25(ptr) AccessChain 121(shadowCoord) 45
-             141:   16(float) CompositeExtract 137 1
-                              Store 140 141
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 143 143 12 12
-             147:     25(ptr) AccessChain 121(shadowCoord) 28
-             148:   16(float) Load 147
-             150:   144(bool) FOrdGreaterThan 148 149
-                              SelectionMerge 152 None
-                              BranchConditional 150 151 152
-             151:               Label
-             153:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             154:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 143 143 12 12
-             155:     25(ptr)   AccessChain 121(shadowCoord) 28
-             156:   16(float)   Load 155
-             157:   144(bool)   FOrdLessThan 156 118
-                                Branch 152
-             152:             Label
-             158:   144(bool) Phi 150 38 157 151
-                              SelectionMerge 160 None
-                              BranchConditional 158 159 160
-             159:               Label
-             161:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             162:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 163 163 12 12
-             167:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 165 164(dist) 51
-             182:         173   Load 179(samplerShadowMap)
-             183:   19(fvec4)   Load 121(shadowCoord)
-             184:   27(fvec2)   VectorShuffle 183 183 0 1
-             185:   27(fvec2)   Load 36(offset)
-             186:   27(fvec2)   FAdd 184 185
-             187:   16(float)   Load 35(layer)
-             188:   16(float)   CompositeExtract 186 0
-             189:   16(float)   CompositeExtract 186 1
-             190:   74(fvec3)   CompositeConstruct 188 189 187
-             191:   19(fvec4)   ImageSampleImplicitLod 182 190
-             192:   16(float)   CompositeExtract 191 0
-                                Store 164(dist) 192
-             193:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 194 194 12 12
-             195:     25(ptr)   AccessChain 121(shadowCoord) 13
-             196:   16(float)   Load 195
-             198:   144(bool)   FOrdGreaterThan 196 197
-                                SelectionMerge 200 None
-                                BranchConditional 198 199 200
-             199:                 Label
-             201:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             202:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 194 194 12 12
-             203:   16(float)     Load 164(dist)
-             204:     25(ptr)     AccessChain 121(shadowCoord) 28
-             205:   16(float)     Load 204
-             206:   144(bool)     FOrdLessThan 203 205
-                                  Branch 200
-             200:               Label
-             207:   144(bool)   Phi 198 159 206 199
-                                SelectionMerge 209 None
-                                BranchConditional 207 208 209
-             208:                 Label
-             210:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             211:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 212 212 12 12
-                                  Store 115(shadow) 213
-                                  Branch 209
-             209:               Label
-                                Branch 160
-             160:             Label
-             214:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
-             215:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 216 216 12 12
-             217:   16(float) Load 115(shadow)
-                              ReturnValue 217
+     110(shadow):     25(ptr) Variable Function
+116(shadowCoord):     22(ptr) Variable Function
+       159(dist):     25(ptr) Variable Function
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 43 43 12 12
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 46 34(P) 49
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 52 35(layer) 49
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 55 36(offset) 49
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 40 37(textureProj(vf4;f1;vf2;)
+             114:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 112 112 12 12
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 111 110(shadow) 49
+                              Store 110(shadow) 115
+             121:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 119 119 12 12
+             120:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 117 116(shadowCoord) 49
+             122:   19(fvec4) Load 34(P)
+             123:     25(ptr) AccessChain 34(P) 13
+             124:   16(float) Load 123
+             125:   19(fvec4) CompositeConstruct 124 124 124 124
+             126:   19(fvec4) FDiv 122 125
+                              Store 116(shadowCoord) 126
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 129 129 12 12
+             127:   19(fvec4) Load 116(shadowCoord)
+             130:   27(fvec2) VectorShuffle 127 127 0 1
+             132:   27(fvec2) VectorTimesScalar 130 131
+             133:   27(fvec2) CompositeConstruct 131 131
+             134:   27(fvec2) FAdd 132 133
+             135:     25(ptr) AccessChain 116(shadowCoord) 12
+             136:   16(float) CompositeExtract 134 0
+                              Store 135 136
+             137:     25(ptr) AccessChain 116(shadowCoord) 45
+             138:   16(float) CompositeExtract 134 1
+                              Store 137 138
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 144 144 12 12
+             142:     25(ptr) AccessChain 116(shadowCoord) 28
+             145:   16(float) Load 142
+             147:   139(bool) FOrdGreaterThan 145 146
+                              SelectionMerge 149 None
+                              BranchConditional 147 148 149
+             148:               Label
+             151:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             152:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 144 144 12 12
+             150:     25(ptr)   AccessChain 116(shadowCoord) 28
+             153:   16(float)   Load 150
+             154:   139(bool)   FOrdLessThan 153 115
+                                Branch 149
+             149:             Label
+             156:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             155:   139(bool) Phi 147 38 154 148
+                              SelectionMerge 158 None
+                              BranchConditional 155 157 158
+             157:               Label
+             164:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             165:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 162 162 12 12
+             163:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 160 159(dist) 49
+             180:         171   Load 177(samplerShadowMap)
+             181:   19(fvec4)   Load 116(shadowCoord)
+             182:   27(fvec2)   VectorShuffle 181 181 0 1
+             183:   27(fvec2)   Load 36(offset)
+             184:   27(fvec2)   FAdd 182 183
+             185:   16(float)   Load 35(layer)
+             186:   16(float)   CompositeExtract 184 0
+             187:   16(float)   CompositeExtract 184 1
+             188:   73(fvec3)   CompositeConstruct 186 187 185
+             189:   19(fvec4)   ImageSampleImplicitLod 180 188
+             190:   16(float)   CompositeExtract 189 0
+                                Store 159(dist) 190
+             192:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 193 193 12 12
+             191:     25(ptr)   AccessChain 116(shadowCoord) 13
+             194:   16(float)   Load 191
+             196:   139(bool)   FOrdGreaterThan 194 195
+                                SelectionMerge 198 None
+                                BranchConditional 196 197 198
+             197:                 Label
+             200:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             201:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 193 193 12 12
+             199:   16(float)     Load 159(dist)
+             202:     25(ptr)     AccessChain 116(shadowCoord) 28
+             203:   16(float)     Load 202
+             204:   139(bool)     FOrdLessThan 199 203
+                                  Branch 198
+             198:               Label
+             206:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             205:   139(bool)   Phi 196 157 204 197
+                                SelectionMerge 208 None
+                                BranchConditional 205 207 208
+             207:                 Label
+             210:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             211:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 212 212 12 12
+                                  Store 110(shadow) 209
+                                  Branch 208
+             208:               Label
+             213:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+                                Branch 158
+             158:             Label
+             215:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 40
+             216:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 217 217 12 12
+             214:   16(float) Load 110(shadow)
+                              ReturnValue 214
                               FunctionEnd
-                              Line 1 76 37
 62(filterPCF(vf4;f1;):   16(float) Function None 58
           60(sc):     22(ptr) FunctionParameter
        61(layer):     25(ptr) FunctionParameter
               63:             Label
-     228(texDim):    226(ptr) Variable Function
-      240(scale):     25(ptr) Variable Function
-         247(dx):     25(ptr) Variable Function
-         261(dy):     25(ptr) Variable Function
-273(shadowFactor):     25(ptr) Variable Function
-      279(count):    253(ptr) Variable Function
-      285(range):    253(ptr) Variable Function
-          292(x):    253(ptr) Variable Function
-          313(y):    253(ptr) Variable Function
-      343(param):     22(ptr) Variable Function
-      345(param):     25(ptr) Variable Function
-      347(param):     30(ptr) Variable Function
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 66 66 12 12
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 69 60(sc) 51
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 72 61(layer) 51
-             220:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 65 62(filterPCF(vf4;f1;)
-             221:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             222:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 223 223 12 12
-             231:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 229 228(texDim) 51
-             232:         173 Load 179(samplerShadowMap)
-             233:         168 Image 232
-             236:  234(ivec3) ImageQuerySizeLod 233 110
-             237:  224(ivec2) VectorShuffle 236 236 0 1
-                              Store 228(texDim) 237
-             238:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 239 239 12 12
-             243:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 241 240(scale) 51
-                              Store 240(scale) 244
-             245:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 246 246 12 12
-             250:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 248 247(dx) 51
-             251:   16(float) Load 240(scale)
-             252:   16(float) FMul 251 118
-             255:    253(ptr) AccessChain 228(texDim) 12
-             256:    101(int) Load 255
-             257:   16(float) ConvertSToF 256
-             258:   16(float) FDiv 252 257
-                              Store 247(dx) 258
-             259:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 260 260 12 12
-             264:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 262 261(dy) 51
-             265:   16(float) Load 240(scale)
-             266:   16(float) FMul 265 118
-             267:    253(ptr) AccessChain 228(texDim) 45
-             268:    101(int) Load 267
-             269:   16(float) ConvertSToF 268
-             270:   16(float) FDiv 266 269
-                              Store 261(dy) 270
-             271:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 272 272 12 12
-             276:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 274 273(shadowFactor) 51
-                              Store 273(shadowFactor) 197
-             277:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 278 278 12 12
-             282:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 280 279(count) 51
-                              Store 279(count) 110
-             283:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 284 284 12 12
-             288:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 286 285(range) 51
-                              Store 285(range) 289
-             290:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 291 291 12 12
-             295:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 293 292(x) 51
-             296:    101(int) Load 285(range)
-             297:    101(int) SNegate 296
-                              Store 292(x) 297
-                              Branch 298
-             298:             Label
-             302:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             303:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 291 291 12 12
-                              LoopMerge 300 301 None
-                              Branch 304
-             304:             Label
-             305:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             306:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 291 291 12 12
-             307:    101(int) Load 292(x)
-             308:    101(int) Load 285(range)
-             309:   144(bool) SLessThanEqual 307 308
-                              BranchConditional 309 299 300
-             299:               Label
-             310:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             311:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 312 312 12 12
-             316:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 314 313(y) 51
-             317:    101(int)   Load 285(range)
-             318:    101(int)   SNegate 317
-                                Store 313(y) 318
-                                Branch 319
-             319:               Label
-             323:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             324:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 312 312 12 12
-                                LoopMerge 321 322 None
-                                Branch 325
-             325:               Label
-             326:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             327:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 312 312 12 12
-             328:    101(int)   Load 313(y)
-             329:    101(int)   Load 285(range)
-             330:   144(bool)   SLessThanEqual 328 329
-                                BranchConditional 330 320 321
-             320:                 Label
-             331:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             332:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 333 333 12 12
-             334:   16(float)     Load 247(dx)
-             335:    101(int)     Load 292(x)
-             336:   16(float)     ConvertSToF 335
-             337:   16(float)     FMul 334 336
-             338:   16(float)     Load 261(dy)
-             339:    101(int)     Load 313(y)
-             340:   16(float)     ConvertSToF 339
-             341:   16(float)     FMul 338 340
-             342:   27(fvec2)     CompositeConstruct 337 341
-             344:   19(fvec4)     Load 60(sc)
-                                  Store 343(param) 344
-             346:   16(float)     Load 61(layer)
-                                  Store 345(param) 346
-                                  Store 347(param) 342
-             348:   16(float)     FunctionCall 37(textureProj(vf4;f1;vf2;) 343(param) 345(param) 347(param)
-             349:   16(float)     Load 273(shadowFactor)
-             350:   16(float)     FAdd 349 348
-                                  Store 273(shadowFactor) 350
-             351:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 352 352 12 12
-             353:    101(int)     Load 279(count)
-             354:    101(int)     IAdd 353 289
-                                  Store 279(count) 354
-                                  Branch 322
-             322:                 Label
-             355:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             356:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 312 312 12 12
-             357:    101(int)     Load 313(y)
-             358:    101(int)     IAdd 357 289
-                                  Store 313(y) 358
-                                  Branch 319
-             321:               Label
-                                Branch 301
-             301:               Label
-             359:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             360:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 291 291 12 12
-             361:    101(int)   Load 292(x)
-             362:    101(int)   IAdd 361 289
-                                Store 292(x) 362
-                                Branch 298
-             300:             Label
-             363:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             364:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 365 365 12 12
-             366:   16(float) Load 273(shadowFactor)
-             367:    101(int) Load 279(count)
-             368:   16(float) ConvertSToF 367
-             369:   16(float) FDiv 366 368
-                              ReturnValue 369
+     227(texDim):    225(ptr) Variable Function
+      239(scale):     25(ptr) Variable Function
+         246(dx):     25(ptr) Variable Function
+         260(dy):     25(ptr) Variable Function
+272(shadowFactor):     25(ptr) Variable Function
+      278(count):    254(ptr) Variable Function
+      284(range):    254(ptr) Variable Function
+          291(x):    254(ptr) Variable Function
+          311(y):    254(ptr) Variable Function
+      344(param):     22(ptr) Variable Function
+      346(param):     25(ptr) Variable Function
+      348(param):     30(ptr) Variable Function
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+              69:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 67 60(sc) 49
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 71 61(layer) 49
+             222:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 66 66 12 12
+             221:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 65 62(filterPCF(vf4;f1;)
+             232:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 230 230 12 12
+             231:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 228 227(texDim) 49
+             233:         171 Load 177(samplerShadowMap)
+             234:         166 Image 233
+             237:  235(ivec3) ImageQuerySizeLod 234 106
+             238:  223(ivec2) VectorShuffle 237 237 0 1
+                              Store 227(texDim) 238
+             244:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 242 242 12 12
+             243:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 240 239(scale) 49
+                              Store 239(scale) 245
+             251:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 249 249 12 12
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 247 246(dx) 49
+             252:   16(float) Load 239(scale)
+             253:   16(float) FMul 252 115
+             256:    254(ptr) AccessChain 227(texDim) 12
+             257:     96(int) Load 256
+             258:   16(float) ConvertSToF 257
+             259:   16(float) FDiv 253 258
+                              Store 246(dx) 259
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 263 263 12 12
+             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 261 260(dy) 49
+             266:   16(float) Load 239(scale)
+             267:   16(float) FMul 266 115
+             268:    254(ptr) AccessChain 227(texDim) 45
+             269:     96(int) Load 268
+             270:   16(float) ConvertSToF 269
+             271:   16(float) FDiv 267 270
+                              Store 260(dy) 271
+             277:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 275 275 12 12
+             276:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 273 272(shadowFactor) 49
+                              Store 272(shadowFactor) 195
+             283:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 281 281 12 12
+             282:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 279 278(count) 49
+                              Store 278(count) 106
+             289:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 287 287 12 12
+             288:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 285 284(range) 49
+                              Store 284(range) 290
+             296:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 294 294 12 12
+             295:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 292 291(x) 49
+             297:     96(int) Load 284(range)
+             298:     96(int) SNegate 297
+                              Store 291(x) 298
+                              Branch 299
+             299:             Label
+             303:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             304:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 294 294 12 12
+                              LoopMerge 301 302 None
+                              Branch 305
+             305:             Label
+             307:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             308:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 294 294 12 12
+             306:     96(int) Load 291(x)
+             309:     96(int) Load 284(range)
+             310:   139(bool) SLessThanEqual 306 309
+                              BranchConditional 310 300 301
+             300:               Label
+             316:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             317:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 314 314 12 12
+             315:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 312 311(y) 49
+             318:     96(int)   Load 284(range)
+             319:     96(int)   SNegate 318
+                                Store 311(y) 319
+                                Branch 320
+             320:               Label
+             324:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             325:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 314 314 12 12
+                                LoopMerge 322 323 None
+                                Branch 326
+             326:               Label
+             328:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             329:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 314 314 12 12
+             327:     96(int)   Load 311(y)
+             330:     96(int)   Load 284(range)
+             331:   139(bool)   SLessThanEqual 327 330
+                                BranchConditional 331 321 322
+             321:                 Label
+             333:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             334:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 335 335 12 12
+             332:   16(float)     Load 246(dx)
+             336:     96(int)     Load 291(x)
+             337:   16(float)     ConvertSToF 336
+             338:   16(float)     FMul 332 337
+             339:   16(float)     Load 260(dy)
+             340:     96(int)     Load 311(y)
+             341:   16(float)     ConvertSToF 340
+             342:   16(float)     FMul 339 341
+             343:   27(fvec2)     CompositeConstruct 338 342
+             345:   19(fvec4)     Load 60(sc)
+                                  Store 344(param) 345
+             347:   16(float)     Load 61(layer)
+                                  Store 346(param) 347
+                                  Store 348(param) 343
+             349:   16(float)     FunctionCall 37(textureProj(vf4;f1;vf2;) 344(param) 346(param) 348(param)
+             350:   16(float)     Load 272(shadowFactor)
+             351:   16(float)     FAdd 350 349
+                                  Store 272(shadowFactor) 351
+             353:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 354 354 12 12
+             352:     96(int)     Load 278(count)
+             355:     96(int)     IAdd 352 290
+                                  Store 278(count) 355
+                                  Branch 323
+             323:                 Label
+             357:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             358:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 314 314 12 12
+             356:     96(int)     Load 311(y)
+             359:     96(int)     IAdd 356 290
+                                  Store 311(y) 359
+                                  Branch 320
+             322:               Label
+             360:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+                                Branch 302
+             302:               Label
+             362:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             363:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 294 294 12 12
+             361:     96(int)   Load 291(x)
+             364:     96(int)   IAdd 361 290
+                                Store 291(x) 364
+                                Branch 299
+             301:             Label
+             366:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 368 368 12 12
+             365:   16(float) Load 272(shadowFactor)
+             369:     96(int) Load 278(count)
+             370:   16(float) ConvertSToF 369
+             371:   16(float) FDiv 365 370
+                              ReturnValue 371
                               FunctionEnd
-                              Line 1 99 41
-82(shadow(vf3;vf3;):   74(fvec3) Function None 78
-   80(fragcolor):     76(ptr) FunctionParameter
-     81(fragpos):     76(ptr) FunctionParameter
-              83:             Label
-          376(i):    253(ptr) Variable Function
+81(shadow(vf3;vf3;):   73(fvec3) Function None 77
+   79(fragcolor):     75(ptr) FunctionParameter
+     80(fragpos):     75(ptr) FunctionParameter
+              82:             Label
+          377(i):    254(ptr) Variable Function
  395(shadowClip):     22(ptr) Variable Function
-444(shadowFactor):     25(ptr) Variable Function
-      449(param):     22(ptr) Variable Function
-      451(param):     25(ptr) Variable Function
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 86 86 12 12
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 89 80(fragcolor) 51
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 92 81(fragpos) 51
-             372:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 85 82(shadow(vf3;vf3;)
-             373:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             374:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 375 375 12 12
-             379:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 377 376(i) 51
-                              Store 376(i) 110
-                              Branch 380
-             380:             Label
-             384:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             385:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 375 375 12 12
-                              LoopMerge 382 383 None
-                              Branch 386
-             386:             Label
-             387:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             388:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 375 375 12 12
-             389:    101(int) Load 376(i)
-             391:   144(bool) SLessThan 389 390
-                              BranchConditional 391 381 382
-             381:               Label
-             392:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             393:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 394 394 12 12
-             398:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 396 395(shadowClip) 51
-             431:    101(int)   Load 376(i)
-             434:    432(ptr)   AccessChain 428(ubo) 289 431 390
-             435:         399   Load 434
-             436:   74(fvec3)   Load 81(fragpos)
-             437:   16(float)   CompositeExtract 436 0
-             438:   16(float)   CompositeExtract 436 1
-             439:   16(float)   CompositeExtract 436 2
-             440:   19(fvec4)   CompositeConstruct 437 438 439 118
-             441:   19(fvec4)   MatrixTimesVector 435 440
-                                Store 395(shadowClip) 441
-             442:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 443 443 12 12
-             446:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 445 444(shadowFactor) 51
-             447:    101(int)   Load 376(i)
-             448:   16(float)   ConvertSToF 447
-             450:   19(fvec4)   Load 395(shadowClip)
-                                Store 449(param) 450
-                                Store 451(param) 448
-             452:   16(float)   FunctionCall 62(filterPCF(vf4;f1;) 449(param) 451(param)
-                                Store 444(shadowFactor) 452
-             453:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 454 454 12 12
-             455:   16(float)   Load 444(shadowFactor)
-             456:   74(fvec3)   Load 80(fragcolor)
-             457:   74(fvec3)   VectorTimesScalar 456 455
-                                Store 80(fragcolor) 457
+445(shadowFactor):     25(ptr) Variable Function
+      452(param):     22(ptr) Variable Function
+      454(param):     25(ptr) Variable Function
+              89:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 86 79(fragcolor) 49
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 90 80(fragpos) 49
+             376:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 85 85 12 12
+             375:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 84 81(shadow(vf3;vf3;)
+             382:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 380 380 12 12
+             381:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 378 377(i) 49
+                              Store 377(i) 106
+                              Branch 383
+             383:             Label
+             387:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             388:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 380 380 12 12
+                              LoopMerge 385 386 None
+                              Branch 389
+             389:             Label
+             391:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             392:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 380 380 12 12
+             390:     96(int) Load 377(i)
+             394:   139(bool) SLessThan 390 393
+                              BranchConditional 394 384 385
+             384:               Label
+             400:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             401:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 398 398 12 12
+             399:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 396 395(shadowClip) 49
+             434:     96(int)   Load 377(i)
+             437:    435(ptr)   AccessChain 431(ubo) 290 434 393
+             438:         402   Load 437
+             439:   73(fvec3)   Load 80(fragpos)
+             440:   16(float)   CompositeExtract 439 0
+             441:   16(float)   CompositeExtract 439 1
+             442:   16(float)   CompositeExtract 439 2
+             443:   19(fvec4)   CompositeConstruct 440 441 442 115
+             444:   19(fvec4)   MatrixTimesVector 438 443
+                                Store 395(shadowClip) 444
+             449:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 447 447 12 12
+             448:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 446 445(shadowFactor) 49
+             450:     96(int)   Load 377(i)
+             451:   16(float)   ConvertSToF 450
+             453:   19(fvec4)   Load 395(shadowClip)
+                                Store 452(param) 453
+                                Store 454(param) 451
+             455:   16(float)   FunctionCall 62(filterPCF(vf4;f1;) 452(param) 454(param)
+                                Store 445(shadowFactor) 455
+             457:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 458 458 12 12
+             456:   16(float)   Load 445(shadowFactor)
+             459:   73(fvec3)   Load 79(fragcolor)
+             460:   73(fvec3)   VectorTimesScalar 459 456
+                                Store 79(fragcolor) 460
+                                Branch 386
+             386:               Label
+             462:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             463:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 380 380 12 12
+             461:     96(int)   Load 377(i)
+             464:     96(int)   IAdd 461 290
+                                Store 377(i) 464
                                 Branch 383
-             383:               Label
-             458:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             459:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 375 375 12 12
-             460:    101(int)   Load 376(i)
-             461:    101(int)   IAdd 460 289
-                                Store 376(i) 461
-                                Branch 380
-             382:             Label
-             462:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             463:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 464 464 12 12
-             465:   74(fvec3) Load 80(fragcolor)
+             385:             Label
+             466:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             467:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 41 468 468 12 12
+             465:   73(fvec3) Load 79(fragcolor)
                               ReturnValue 465
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.geom.out b/Test/baseResults/spv.debuginfo.glsl.geom.out
index eff5627f..c21571c1 100644
--- a/Test/baseResults/spv.debuginfo.glsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.glsl.geom.out
@@ -1,20 +1,20 @@
 spv.debuginfo.glsl.geom
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 272
+// Id's are bound by 273
 
                               Capability Geometry
                               Capability MultiViewport
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Geometry 14  "main" 66 99 120 131 134 167 209 218 236 250 256 259
+                              EntryPoint Geometry 14  "main" 64 98 121 130 134 168 208 217 236 249 255 259
                               ExecutionMode 14 Triangles
                               ExecutionMode 14 Invocations 2
                               ExecutionMode 14 OutputTriangleStrip
                               ExecutionMode 14 OutputVertices 3
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               16:             String  "main"
               19:             String  "// OpModuleProcessed auto-map-locations
@@ -25,97 +25,97 @@ spv.debuginfo.glsl.geom
 // OpModuleProcessed entry-point main
 #line 1
 "
-              30:             String  "int"
-              37:             String  "i"
-              53:             String  "bool"
-              60:             String  "float"
-              68:             String  "outNormal"
-              81:             String  "projection"
-              84:             String  "modelview"
-              87:             String  "lightPos"
-              90:             String  "UBO"
-              95:             String  "ubo"
-             101:             String  "gl_InvocationID"
-             122:             String  "inNormal"
-             133:             String  "outColor"
+              29:             String  "int"
+              36:             String  "i"
+              54:             String  "bool"
+              58:             String  "float"
+              66:             String  "outNormal"
+              80:             String  "projection"
+              83:             String  "modelview"
+              86:             String  "lightPos"
+              89:             String  "UBO"
+              94:             String  "ubo"
+             100:             String  "gl_InvocationID"
+             123:             String  "inNormal"
+             132:             String  "outColor"
              136:             String  "inColor"
-             146:             String  "pos"
-             152:             String  "gl_Position"
-             155:             String  "gl_PointSize"
-             158:             String  "gl_CullDistance"
-             162:             String  "gl_PerVertex"
-             169:             String  "gl_in"
-             179:             String  "worldPos"
-             192:             String  "lPos"
-             211:             String  "outLightVec"
-             220:             String  "outViewVec"
-             252:             String  "gl_ViewportIndex"
-             258:             String  "gl_PrimitiveID"
+             145:             String  "pos"
+             153:             String  "gl_Position"
+             156:             String  "gl_PointSize"
+             159:             String  "gl_CullDistance"
+             163:             String  "gl_PerVertex"
+             170:             String  "gl_in"
+             178:             String  "worldPos"
+             191:             String  "lPos"
+             210:             String  "outLightVec"
+             219:             String  "outViewVec"
+             251:             String  "gl_ViewportIndex"
+             257:             String  "gl_PrimitiveID"
              261:             String  "gl_PrimitiveIDIn"
                               SourceExtension  "GL_ARB_viewport_array"
                               Name 14  "main"
-                              Name 35  "i"
-                              Name 66  "outNormal"
-                              Name 79  "UBO"
-                              MemberName 79(UBO) 0  "projection"
-                              MemberName 79(UBO) 1  "modelview"
-                              MemberName 79(UBO) 2  "lightPos"
-                              Name 93  "ubo"
-                              Name 99  "gl_InvocationID"
-                              Name 120  "inNormal"
-                              Name 131  "outColor"
+                              Name 34  "i"
+                              Name 64  "outNormal"
+                              Name 78  "UBO"
+                              MemberName 78(UBO) 0  "projection"
+                              MemberName 78(UBO) 1  "modelview"
+                              MemberName 78(UBO) 2  "lightPos"
+                              Name 92  "ubo"
+                              Name 98  "gl_InvocationID"
+                              Name 121  "inNormal"
+                              Name 130  "outColor"
                               Name 134  "inColor"
-                              Name 144  "pos"
-                              Name 150  "gl_PerVertex"
-                              MemberName 150(gl_PerVertex) 0  "gl_Position"
-                              MemberName 150(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 150(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 150(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 167  "gl_in"
-                              Name 177  "worldPos"
-                              Name 190  "lPos"
-                              Name 209  "outLightVec"
-                              Name 218  "outViewVec"
-                              Name 226  "gl_PerVertex"
-                              MemberName 226(gl_PerVertex) 0  "gl_Position"
-                              MemberName 226(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 226(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 226(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 143  "pos"
+                              Name 151  "gl_PerVertex"
+                              MemberName 151(gl_PerVertex) 0  "gl_Position"
+                              MemberName 151(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 151(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 151(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 168  "gl_in"
+                              Name 176  "worldPos"
+                              Name 189  "lPos"
+                              Name 208  "outLightVec"
+                              Name 217  "outViewVec"
+                              Name 225  "gl_PerVertex"
+                              MemberName 225(gl_PerVertex) 0  "gl_Position"
+                              MemberName 225(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 225(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 225(gl_PerVertex) 3  "gl_CullDistance"
                               Name 236  ""
-                              Name 250  "gl_ViewportIndex"
-                              Name 256  "gl_PrimitiveID"
+                              Name 249  "gl_ViewportIndex"
+                              Name 255  "gl_PrimitiveID"
                               Name 259  "gl_PrimitiveIDIn"
-                              Decorate 66(outNormal) Location 0
-                              Decorate 75 ArrayStride 64
-                              Decorate 77 ArrayStride 64
-                              MemberDecorate 79(UBO) 0 ColMajor
-                              MemberDecorate 79(UBO) 0 Offset 0
-                              MemberDecorate 79(UBO) 0 MatrixStride 16
-                              MemberDecorate 79(UBO) 1 ColMajor
-                              MemberDecorate 79(UBO) 1 Offset 128
-                              MemberDecorate 79(UBO) 1 MatrixStride 16
-                              MemberDecorate 79(UBO) 2 Offset 256
-                              Decorate 79(UBO) Block
-                              Decorate 93(ubo) DescriptorSet 0
-                              Decorate 93(ubo) Binding 0
-                              Decorate 99(gl_InvocationID) BuiltIn InvocationId
-                              Decorate 120(inNormal) Location 0
-                              Decorate 131(outColor) Location 1
+                              Decorate 64(outNormal) Location 0
+                              Decorate 74 ArrayStride 64
+                              Decorate 76 ArrayStride 64
+                              MemberDecorate 78(UBO) 0 ColMajor
+                              MemberDecorate 78(UBO) 0 Offset 0
+                              MemberDecorate 78(UBO) 0 MatrixStride 16
+                              MemberDecorate 78(UBO) 1 ColMajor
+                              MemberDecorate 78(UBO) 1 Offset 128
+                              MemberDecorate 78(UBO) 1 MatrixStride 16
+                              MemberDecorate 78(UBO) 2 Offset 256
+                              Decorate 78(UBO) Block
+                              Decorate 92(ubo) DescriptorSet 0
+                              Decorate 92(ubo) Binding 0
+                              Decorate 98(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 121(inNormal) Location 0
+                              Decorate 130(outColor) Location 1
                               Decorate 134(inColor) Location 1
-                              MemberDecorate 150(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 150(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 150(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 150(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 150(gl_PerVertex) Block
-                              Decorate 209(outLightVec) Location 3
-                              Decorate 218(outViewVec) Location 2
-                              MemberDecorate 226(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 226(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 226(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 226(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 226(gl_PerVertex) Block
-                              Decorate 250(gl_ViewportIndex) BuiltIn ViewportIndex
-                              Decorate 256(gl_PrimitiveID) BuiltIn PrimitiveId
+                              MemberDecorate 151(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 151(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 151(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 151(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 151(gl_PerVertex) Block
+                              Decorate 208(outLightVec) Location 3
+                              Decorate 217(outViewVec) Location 2
+                              MemberDecorate 225(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 225(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 225(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 225(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 225(gl_PerVertex) Block
+                              Decorate 249(gl_ViewportIndex) BuiltIn ViewportIndex
+                              Decorate 255(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 259(gl_PrimitiveIDIn) BuiltIn PrimitiveId
                4:             TypeVoid
                5:             TypeFunction 4
@@ -123,258 +123,258 @@ spv.debuginfo.glsl.geom
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 19
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               20:      7(int) Constant 47
               22:      7(int) Constant 1
               23:      7(int) Constant 4
               24:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
-              17:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
-              28:      7(int) Constant 49
-              29:             TypeInt 32 1
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 30 10 23 12
-              32:             TypePointer Function 29(int)
-              33:      7(int) Constant 7
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 33 12
-              36:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 37 31 18 28 12 17 23
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              40:     29(int) Constant 0
-              51:     29(int) Constant 3
-              52:             TypeBool
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 53 10 24 12
-              58:      7(int) Constant 51
-              59:             TypeFloat 32
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 60 10 13 12
-              62:             TypeVector 59(float) 3
-              63:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 61 13
-              64:             TypePointer Output 62(fvec3)
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 13 12
-   66(outNormal):     64(ptr) Variable Output
-              69:      7(int) Constant 8
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 68 63 18 58 12 21 68 66(outNormal) 69
-              70:             TypeVector 59(float) 4
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 61 23
-              72:             TypeMatrix 70(fvec4) 4
-              74:    52(bool) ConstantTrue
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 71 23 74
-              75:             TypeArray 72 24
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 73 24
-              77:             TypeArray 72 24
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 73 24
-         79(UBO):             TypeStruct 75 77 70(fvec4)
-              82:      7(int) Constant 34
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 81 76 18 82 33 12 12 13
-              85:      7(int) Constant 35
-              83:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 84 78 18 85 33 12 12 13
-              88:      7(int) Constant 36
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 87 71 18 88 33 12 12 13
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 90 22 18 58 12 21 90 12 13 80 83 86
-              91:             TypePointer Uniform 79(UBO)
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 89 24 12
-         93(ubo):     91(ptr) Variable Uniform
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 95 89 18 58 12 21 95 93(ubo) 69
-              96:     29(int) Constant 1
-              97:             TypePointer Input 29(int)
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 22 12
-99(gl_InvocationID):     97(ptr) Variable Input
-             100:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 101 31 18 58 12 21 101 99(gl_InvocationID) 69
-             103:             TypePointer Uniform 72
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 73 24 12
-             107:             TypeMatrix 62(fvec3) 3
-             108:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 63 13 74
-             116:             TypeArray 62(fvec3) 13
-             117:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 63 13
-             118:             TypePointer Input 116
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 22 12
-   120(inNormal):    118(ptr) Variable Input
-             121:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 122 117 18 58 12 21 122 120(inNormal) 69
-             124:             TypePointer Input 62(fvec3)
-             125:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 22 12
-             130:      7(int) Constant 52
-   131(outColor):     64(ptr) Variable Output
-             132:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 133 63 18 130 12 21 133 131(outColor) 69
-    134(inColor):    118(ptr) Variable Input
-             135:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 136 117 18 130 12 21 136 134(inColor) 69
-             141:      7(int) Constant 54
-             142:             TypePointer Function 70(fvec4)
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 71 33 12
-             145:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 146 71 18 141 12 17 23
-             148:             TypeArray 59(float) 22
-             149:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 61 22
-150(gl_PerVertex):             TypeStruct 70(fvec4) 59(float) 148 148
-             153:      7(int) Constant 23
-             151:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 152 71 18 24 153 12 12 13
-             156:      7(int) Constant 41
-             154:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 155 61 18 24 156 12 12 13
-             159:      7(int) Constant 84
-             157:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 158 149 18 24 159 12 12 13
-             160:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 158 149 18 24 159 12 12 13
-             161:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 162 22 18 141 12 21 162 12 13 151 154 157 160
-             163:             TypeArray 150(gl_PerVertex) 13
-             164:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 161 13
-             165:             TypePointer Input 163
-             166:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 164 22 12
-      167(gl_in):    165(ptr) Variable Input
-             168:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 169 164 18 141 12 21 169 167(gl_in) 69
-             171:             TypePointer Input 70(fvec4)
-             172:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 71 22 12
-             176:      7(int) Constant 55
-             178:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 179 71 18 176 12 17 23
-             187:      7(int) Constant 57
-             188:             TypePointer Function 62(fvec3)
-             189:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 33 12
-             191:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 192 63 18 187 12 17 23
-             197:     29(int) Constant 2
-             198:             TypePointer Uniform 70(fvec4)
-             199:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 71 24 12
-             208:      7(int) Constant 58
-209(outLightVec):     64(ptr) Variable Output
-             210:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 211 63 18 208 12 21 211 209(outLightVec) 69
-             217:      7(int) Constant 59
- 218(outViewVec):     64(ptr) Variable Output
-             219:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 220 63 18 217 12 21 220 218(outViewVec) 69
-             225:      7(int) Constant 61
-226(gl_PerVertex):             TypeStruct 70(fvec4) 59(float) 148 148
-             228:      7(int) Constant 215
-             227:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 152 71 18 24 228 12 12 13
-             230:      7(int) Constant 233
-             229:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 155 61 18 24 230 12 12 13
-             231:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 158 149 18 13 33 12 12 13
-             232:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 158 149 18 13 33 12 12 13
-             233:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 162 22 18 225 12 21 162 12 13 227 229 231 232
-             234:             TypePointer Output 226(gl_PerVertex)
-             235:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 233 13 12
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
+              17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
+              28:             TypeInt 32 1
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 29 10 23 12
+              31:             TypePointer Function 28(int)
+              32:      7(int) Constant 7
+              33:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 32 12
+              37:      7(int) Constant 49
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 36 30 18 37 12 17 23
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              41:     28(int) Constant 0
+              52:     28(int) Constant 3
+              53:             TypeBool
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 54 10 24 12
+              57:             TypeFloat 32
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 58 10 13 12
+              60:             TypeVector 57(float) 3
+              61:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 59 13
+              62:             TypePointer Output 60(fvec3)
+              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 13 12
+   64(outNormal):     62(ptr) Variable Output
+              67:      7(int) Constant 51
+              68:      7(int) Constant 8
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 66 61 18 67 12 21 66 64(outNormal) 68
+              69:             TypeVector 57(float) 4
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 59 23
+              71:             TypeMatrix 69(fvec4) 4
+              73:    53(bool) ConstantTrue
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 70 23 73
+              74:             TypeArray 71 24
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 72 24
+              76:             TypeArray 71 24
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 72 24
+         78(UBO):             TypeStruct 74 76 69(fvec4)
+              81:      7(int) Constant 34
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 80 75 18 81 32 12 12 13
+              84:      7(int) Constant 35
+              82:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 83 77 18 84 32 12 12 13
+              87:      7(int) Constant 36
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 86 70 18 87 32 12 12 13
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 89 22 18 67 12 21 89 12 13 79 82 85
+              90:             TypePointer Uniform 78(UBO)
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 88 24 12
+         92(ubo):     90(ptr) Variable Uniform
+              93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 94 88 18 67 12 21 94 92(ubo) 68
+              95:     28(int) Constant 1
+              96:             TypePointer Input 28(int)
+              97:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 22 12
+98(gl_InvocationID):     96(ptr) Variable Input
+              99:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 100 30 18 67 12 21 100 98(gl_InvocationID) 68
+             104:             TypePointer Uniform 71
+             105:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 24 12
+             108:             TypeMatrix 60(fvec3) 3
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 61 13 73
+             117:             TypeArray 60(fvec3) 13
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 61 13
+             119:             TypePointer Input 117
+             120:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 118 22 12
+   121(inNormal):    119(ptr) Variable Input
+             122:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 123 118 18 67 12 21 123 121(inNormal) 68
+             125:             TypePointer Input 60(fvec3)
+             126:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 22 12
+   130(outColor):     62(ptr) Variable Output
+             133:      7(int) Constant 52
+             131:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 132 61 18 133 12 21 132 130(outColor) 68
+    134(inColor):    119(ptr) Variable Input
+             135:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 136 118 18 133 12 21 136 134(inColor) 68
+             141:             TypePointer Function 69(fvec4)
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 70 32 12
+             146:      7(int) Constant 54
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 145 70 18 146 12 17 23
+             149:             TypeArray 57(float) 22
+             150:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 59 22
+151(gl_PerVertex):             TypeStruct 69(fvec4) 57(float) 149 149
+             154:      7(int) Constant 23
+             152:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 153 70 18 24 154 12 12 13
+             157:      7(int) Constant 41
+             155:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 156 59 18 24 157 12 12 13
+             160:      7(int) Constant 84
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 159 150 18 24 160 12 12 13
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 159 150 18 24 160 12 12 13
+             162:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 163 22 18 146 12 21 163 12 13 152 155 158 161
+             164:             TypeArray 151(gl_PerVertex) 13
+             165:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 162 13
+             166:             TypePointer Input 164
+             167:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 165 22 12
+      168(gl_in):    166(ptr) Variable Input
+             169:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 170 165 18 146 12 21 170 168(gl_in) 68
+             172:             TypePointer Input 69(fvec4)
+             173:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 70 22 12
+             179:      7(int) Constant 55
+             177:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 178 70 18 179 12 17 23
+             187:             TypePointer Function 60(fvec3)
+             188:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 32 12
+             192:      7(int) Constant 57
+             190:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 191 61 18 192 12 17 23
+             198:     28(int) Constant 2
+             199:             TypePointer Uniform 69(fvec4)
+             200:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 70 24 12
+208(outLightVec):     62(ptr) Variable Output
+             211:      7(int) Constant 58
+             209:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 210 61 18 211 12 21 210 208(outLightVec) 68
+ 217(outViewVec):     62(ptr) Variable Output
+             220:      7(int) Constant 59
+             218:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 219 61 18 220 12 21 219 217(outViewVec) 68
+225(gl_PerVertex):             TypeStruct 69(fvec4) 57(float) 149 149
+             227:      7(int) Constant 215
+             226:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 153 70 18 24 227 12 12 13
+             229:      7(int) Constant 233
+             228:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 156 59 18 24 229 12 12 13
+             230:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 159 150 18 13 32 12 12 13
+             231:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 159 150 18 13 32 12 12 13
+             233:      7(int) Constant 61
+             232:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 163 22 18 233 12 21 163 12 13 226 228 230 231
+             234:             TypePointer Output 225(gl_PerVertex)
+             235:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 232 13 12
              236:    234(ptr) Variable Output
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 233 18 225 12 21 1 236 69
-             243:             TypePointer Output 70(fvec4)
-             244:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 71 13 12
-             247:      7(int) Constant 64
-             248:             TypePointer Output 29(int)
-             249:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 13 12
-250(gl_ViewportIndex):    248(ptr) Variable Output
-             251:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 252 31 18 247 12 21 252 250(gl_ViewportIndex) 69
-             255:      7(int) Constant 65
-256(gl_PrimitiveID):    248(ptr) Variable Output
-             257:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 258 31 18 255 12 21 258 256(gl_PrimitiveID) 69
-259(gl_PrimitiveIDIn):     97(ptr) Variable Input
-             260:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 261 31 18 255 12 21 261 259(gl_PrimitiveIDIn) 69
-             264:      7(int) Constant 66
-             271:      7(int) Constant 68
-                              Line 1 47 15
+             237:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 232 18 233 12 21 2 236 68
+             244:             TypePointer Output 69(fvec4)
+             245:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 70 13 12
+             247:             TypePointer Output 28(int)
+             248:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 13 12
+249(gl_ViewportIndex):    247(ptr) Variable Output
+             252:      7(int) Constant 64
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 251 30 18 252 12 21 251 249(gl_ViewportIndex) 68
+255(gl_PrimitiveID):    247(ptr) Variable Output
+             258:      7(int) Constant 65
+             256:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 257 30 18 258 12 21 257 255(gl_PrimitiveID) 68
+259(gl_PrimitiveIDIn):     96(ptr) Variable Input
+             260:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 261 30 18 258 12 21 261 259(gl_PrimitiveIDIn) 68
+             265:      7(int) Constant 66
+             272:      7(int) Constant 68
         14(main):           4 Function None 5
               15:             Label
-           35(i):     32(ptr) Variable Function
-        144(pos):    142(ptr) Variable Function
-   177(worldPos):    142(ptr) Variable Function
-       190(lPos):    188(ptr) Variable Function
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-              38:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 36 35(i) 39
-                              Store 35(i) 40
-                              Branch 41
-              41:             Label
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-                              LoopMerge 43 44 None
-                              Branch 47
-              47:             Label
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              49:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-              50:     29(int) Load 35(i)
-              55:    52(bool) SLessThan 50 51
-                              BranchConditional 55 42 43
-              42:               Label
-              56:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              57:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 58 58 12 12
-             102:     29(int)   Load 99(gl_InvocationID)
-             105:    103(ptr)   AccessChain 93(ubo) 96 102
-             106:          72   Load 105
-             109:   70(fvec4)   CompositeExtract 106 0
-             110:   62(fvec3)   VectorShuffle 109 109 0 1 2
-             111:   70(fvec4)   CompositeExtract 106 1
-             112:   62(fvec3)   VectorShuffle 111 111 0 1 2
-             113:   70(fvec4)   CompositeExtract 106 2
-             114:   62(fvec3)   VectorShuffle 113 113 0 1 2
-             115:         107   CompositeConstruct 110 112 114
-             123:     29(int)   Load 35(i)
-             126:    124(ptr)   AccessChain 120(inNormal) 123
-             127:   62(fvec3)   Load 126
-             128:   62(fvec3)   MatrixTimesVector 115 127
-                                Store 66(outNormal) 128
-             129:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 130 130 12 12
-             137:     29(int)   Load 35(i)
-             138:    124(ptr)   AccessChain 134(inColor) 137
-             139:   62(fvec3)   Load 138
-                                Store 131(outColor) 139
-             140:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 141 141 12 12
-             147:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 145 144(pos) 39
-             170:     29(int)   Load 35(i)
-             173:    171(ptr)   AccessChain 167(gl_in) 170 40
-             174:   70(fvec4)   Load 173
-                                Store 144(pos) 174
-             175:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 176 176 12 12
-             180:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 178 177(worldPos) 39
-             181:     29(int)   Load 99(gl_InvocationID)
-             182:    103(ptr)   AccessChain 93(ubo) 96 181
-             183:          72   Load 182
-             184:   70(fvec4)   Load 144(pos)
-             185:   70(fvec4)   MatrixTimesVector 183 184
-                                Store 177(worldPos) 185
-             186:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 187 187 12 12
-             193:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 191 190(lPos) 39
-             194:     29(int)   Load 99(gl_InvocationID)
-             195:    103(ptr)   AccessChain 93(ubo) 96 194
-             196:          72   Load 195
-             200:    198(ptr)   AccessChain 93(ubo) 197
-             201:   70(fvec4)   Load 200
-             202:   70(fvec4)   MatrixTimesVector 196 201
-             203:   59(float)   CompositeExtract 202 0
-             204:   59(float)   CompositeExtract 202 1
-             205:   59(float)   CompositeExtract 202 2
-             206:   62(fvec3)   CompositeConstruct 203 204 205
-                                Store 190(lPos) 206
-             207:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 208 208 12 12
-             212:   62(fvec3)   Load 190(lPos)
-             213:   70(fvec4)   Load 177(worldPos)
-             214:   62(fvec3)   VectorShuffle 213 213 0 1 2
-             215:   62(fvec3)   FSub 212 214
-                                Store 209(outLightVec) 215
-             216:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 217 217 12 12
-             221:   70(fvec4)   Load 177(worldPos)
-             222:   62(fvec3)   VectorShuffle 221 221 0 1 2
-             223:   62(fvec3)   FNegate 222
-                                Store 218(outViewVec) 223
-             224:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 225 225 12 12
-             238:     29(int)   Load 99(gl_InvocationID)
-             239:    103(ptr)   AccessChain 93(ubo) 40 238
-             240:          72   Load 239
-             241:   70(fvec4)   Load 177(worldPos)
-             242:   70(fvec4)   MatrixTimesVector 240 241
-             245:    243(ptr)   AccessChain 236 40
-                                Store 245 242
-             246:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 247 247 12 12
-             253:     29(int)   Load 99(gl_InvocationID)
-                                Store 250(gl_ViewportIndex) 253
-             254:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 255 255 12 12
-             262:     29(int)   Load 259(gl_PrimitiveIDIn)
-                                Store 256(gl_PrimitiveID) 262
-             263:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 264 264 12 12
+           34(i):     31(ptr) Variable Function
+        143(pos):    141(ptr) Variable Function
+   176(worldPos):    141(ptr) Variable Function
+       189(lPos):    187(ptr) Variable Function
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 37 37 12 12
+              38:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 35 34(i) 39
+                              Store 34(i) 41
+                              Branch 42
+              42:             Label
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 37 37 12 12
+                              LoopMerge 44 45 None
+                              Branch 48
+              48:             Label
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 37 37 12 12
+              49:     28(int) Load 34(i)
+              56:    53(bool) SLessThan 49 52
+                              BranchConditional 56 43 44
+              43:               Label
+             102:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+             103:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 67 67 12 12
+             101:     28(int)   Load 98(gl_InvocationID)
+             106:    104(ptr)   AccessChain 92(ubo) 95 101
+             107:          71   Load 106
+             110:   69(fvec4)   CompositeExtract 107 0
+             111:   60(fvec3)   VectorShuffle 110 110 0 1 2
+             112:   69(fvec4)   CompositeExtract 107 1
+             113:   60(fvec3)   VectorShuffle 112 112 0 1 2
+             114:   69(fvec4)   CompositeExtract 107 2
+             115:   60(fvec3)   VectorShuffle 114 114 0 1 2
+             116:         108   CompositeConstruct 111 113 115
+             124:     28(int)   Load 34(i)
+             127:    125(ptr)   AccessChain 121(inNormal) 124
+             128:   60(fvec3)   Load 127
+             129:   60(fvec3)   MatrixTimesVector 116 128
+                                Store 64(outNormal) 129
+             138:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 133 133 12 12
+             137:     28(int)   Load 34(i)
+             139:    125(ptr)   AccessChain 134(inColor) 137
+             140:   60(fvec3)   Load 139
+                                Store 130(outColor) 140
+             148:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 146 146 12 12
+             147:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 144 143(pos) 39
+             171:     28(int)   Load 34(i)
+             174:    172(ptr)   AccessChain 168(gl_in) 171 41
+             175:   69(fvec4)   Load 174
+                                Store 143(pos) 175
+             181:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 179 179 12 12
+             180:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 177 176(worldPos) 39
+             182:     28(int)   Load 98(gl_InvocationID)
+             183:    104(ptr)   AccessChain 92(ubo) 95 182
+             184:          71   Load 183
+             185:   69(fvec4)   Load 143(pos)
+             186:   69(fvec4)   MatrixTimesVector 184 185
+                                Store 176(worldPos) 186
+             194:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 192 192 12 12
+             193:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 190 189(lPos) 39
+             195:     28(int)   Load 98(gl_InvocationID)
+             196:    104(ptr)   AccessChain 92(ubo) 95 195
+             197:          71   Load 196
+             201:    199(ptr)   AccessChain 92(ubo) 198
+             202:   69(fvec4)   Load 201
+             203:   69(fvec4)   MatrixTimesVector 197 202
+             204:   57(float)   CompositeExtract 203 0
+             205:   57(float)   CompositeExtract 203 1
+             206:   57(float)   CompositeExtract 203 2
+             207:   60(fvec3)   CompositeConstruct 204 205 206
+                                Store 189(lPos) 207
+             213:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 211 211 12 12
+             212:   60(fvec3)   Load 189(lPos)
+             214:   69(fvec4)   Load 176(worldPos)
+             215:   60(fvec3)   VectorShuffle 214 214 0 1 2
+             216:   60(fvec3)   FSub 212 215
+                                Store 208(outLightVec) 216
+             222:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 220 220 12 12
+             221:   69(fvec4)   Load 176(worldPos)
+             223:   60(fvec3)   VectorShuffle 221 221 0 1 2
+             224:   60(fvec3)   FNegate 223
+                                Store 217(outViewVec) 224
+             239:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 233 233 12 12
+             238:     28(int)   Load 98(gl_InvocationID)
+             240:    104(ptr)   AccessChain 92(ubo) 41 238
+             241:          71   Load 240
+             242:   69(fvec4)   Load 176(worldPos)
+             243:   69(fvec4)   MatrixTimesVector 241 242
+             246:    244(ptr)   AccessChain 236 41
+                                Store 246 243
+             254:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 252 252 12 12
+             253:     28(int)   Load 98(gl_InvocationID)
+                                Store 249(gl_ViewportIndex) 253
+             263:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 258 258 12 12
+             262:     28(int)   Load 259(gl_PrimitiveIDIn)
+                                Store 255(gl_PrimitiveID) 262
+             264:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 265 265 12 12
                                 EmitVertex
-                                Branch 44
-              44:               Label
-             265:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-             266:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-             267:     29(int)   Load 35(i)
-             268:     29(int)   IAdd 267 96
-                                Store 35(i) 268
-                                Branch 41
-              43:             Label
-             269:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-             270:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 271 271 12 12
+                                Branch 45
+              45:               Label
+             267:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+             268:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 37 37 12 12
+             266:     28(int)   Load 34(i)
+             269:     28(int)   IAdd 266 95
+                                Store 34(i) 269
+                                Branch 42
+              44:             Label
+             270:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+             271:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 272 272 12 12
                               EndPrimitive
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.tesc.out b/Test/baseResults/spv.debuginfo.glsl.tesc.out
index b5a7d037..a1aa38b8 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tesc.out
@@ -1,16 +1,16 @@
 spv.debuginfo.glsl.tesc
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 562
+// Id's are bound by 569
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 14  "main" 259 264 293 381 396 511 527 535 552
+                              EntryPoint TessellationControl 14  "main" 260 265 294 383 399 516 532 542 557
                               ExecutionMode 14 OutputVertices 4
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               17:             String  "float"
               31:             String  "screenSpaceTessFactor"
@@ -22,712 +22,713 @@ spv.debuginfo.glsl.tesc
 // OpModuleProcessed entry-point main
 #line 1
 "
-              42:             String  "p0"
+              40:             String  "p0"
               46:             String  "p1"
               49:             String  "bool"
               55:             String  "frustumCheck"
               58:             String  "main"
-              67:             String  "midPoint"
-              80:             String  "radius"
-              91:             String  "v0"
-             102:             String  "modelview"
-             106:             String  "lightPos"
-             109:             String  "frustumPlanes"
-             111:             String  "tessellatedEdgeSize"
-             116:             String  "viewportDim"
-             120:             String  "UBO"
-             125:             String  "ubo"
-             127:             String  "int"
-             140:             String  "clip0"
-             161:             String  "clip1"
-             238:             String  "pos"
-             244:             String  "gl_Position"
-             247:             String  "gl_PointSize"
-             250:             String  "gl_CullDistance"
-             254:             String  "gl_PerVertex"
-             261:             String  "gl_in"
-             266:             String  "gl_InvocationID"
-             276:             String  "type.2d.image"
+              64:             String  "midPoint"
+              77:             String  "radius"
+              88:             String  "v0"
+             101:             String  "modelview"
+             105:             String  "lightPos"
+             108:             String  "frustumPlanes"
+             110:             String  "tessellatedEdgeSize"
+             115:             String  "viewportDim"
+             119:             String  "UBO"
+             124:             String  "ubo"
+             126:             String  "int"
+             137:             String  "clip0"
+             158:             String  "clip1"
+             237:             String  "pos"
+             245:             String  "gl_Position"
+             248:             String  "gl_PointSize"
+             251:             String  "gl_CullDistance"
+             255:             String  "gl_PerVertex"
+             262:             String  "gl_in"
+             267:             String  "gl_InvocationID"
+             275:             String  "type.2d.image"
              277:             String  "@type.2d.image"
              281:             String  "type.sampled.image"
              282:             String  "@type.sampled.image"
              287:             String  "samplerHeight"
-             295:             String  "inUV"
-             316:             String  "i"
-             383:             String  "gl_TessLevelInner"
-             398:             String  "gl_TessLevelOuter"
-             513:             String  "gl_out"
-             529:             String  "outNormal"
-             537:             String  "inNormal"
-             554:             String  "outUV"
+             296:             String  "inUV"
+             315:             String  "i"
+             385:             String  "gl_TessLevelInner"
+             401:             String  "gl_TessLevelOuter"
+             518:             String  "gl_out"
+             534:             String  "outNormal"
+             544:             String  "inNormal"
+             559:             String  "outUV"
                               Name 14  "main"
                               Name 29  "screenSpaceTessFactor(vf4;vf4;"
                               Name 27  "p0"
                               Name 28  "p1"
                               Name 53  "frustumCheck("
-                              Name 65  "midPoint"
-                              Name 78  "radius"
-                              Name 89  "v0"
-                              Name 100  "UBO"
-                              MemberName 100(UBO) 0  "projection"
-                              MemberName 100(UBO) 1  "modelview"
-                              MemberName 100(UBO) 2  "lightPos"
-                              MemberName 100(UBO) 3  "frustumPlanes"
-                              MemberName 100(UBO) 4  "displacementFactor"
-                              MemberName 100(UBO) 5  "tessellationFactor"
-                              MemberName 100(UBO) 6  "viewportDim"
-                              MemberName 100(UBO) 7  "tessellatedEdgeSize"
-                              Name 123  "ubo"
-                              Name 138  "clip0"
-                              Name 159  "clip1"
-                              Name 236  "pos"
-                              Name 242  "gl_PerVertex"
-                              MemberName 242(gl_PerVertex) 0  "gl_Position"
-                              MemberName 242(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 242(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 242(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 259  "gl_in"
-                              Name 264  "gl_InvocationID"
+                              Name 62  "midPoint"
+                              Name 75  "radius"
+                              Name 86  "v0"
+                              Name 99  "UBO"
+                              MemberName 99(UBO) 0  "projection"
+                              MemberName 99(UBO) 1  "modelview"
+                              MemberName 99(UBO) 2  "lightPos"
+                              MemberName 99(UBO) 3  "frustumPlanes"
+                              MemberName 99(UBO) 4  "displacementFactor"
+                              MemberName 99(UBO) 5  "tessellationFactor"
+                              MemberName 99(UBO) 6  "viewportDim"
+                              MemberName 99(UBO) 7  "tessellatedEdgeSize"
+                              Name 122  "ubo"
+                              Name 135  "clip0"
+                              Name 156  "clip1"
+                              Name 235  "pos"
+                              Name 243  "gl_PerVertex"
+                              MemberName 243(gl_PerVertex) 0  "gl_Position"
+                              MemberName 243(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 243(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 243(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 260  "gl_in"
+                              Name 265  "gl_InvocationID"
                               Name 285  "samplerHeight"
-                              Name 293  "inUV"
-                              Name 314  "i"
-                              Name 381  "gl_TessLevelInner"
-                              Name 396  "gl_TessLevelOuter"
-                              Name 422  "param"
-                              Name 425  "param"
-                              Name 432  "param"
+                              Name 294  "inUV"
+                              Name 313  "i"
+                              Name 383  "gl_TessLevelInner"
+                              Name 399  "gl_TessLevelOuter"
+                              Name 424  "param"
+                              Name 430  "param"
                               Name 435  "param"
-                              Name 442  "param"
+                              Name 440  "param"
                               Name 445  "param"
-                              Name 452  "param"
+                              Name 450  "param"
                               Name 455  "param"
-                              Name 499  "gl_PerVertex"
-                              MemberName 499(gl_PerVertex) 0  "gl_Position"
-                              MemberName 499(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 499(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 499(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 511  "gl_out"
-                              Name 527  "outNormal"
-                              Name 535  "inNormal"
-                              Name 552  "outUV"
-                              Decorate 96 ArrayStride 16
-                              MemberDecorate 100(UBO) 0 ColMajor
-                              MemberDecorate 100(UBO) 0 Offset 0
-                              MemberDecorate 100(UBO) 0 MatrixStride 16
-                              MemberDecorate 100(UBO) 1 ColMajor
-                              MemberDecorate 100(UBO) 1 Offset 64
-                              MemberDecorate 100(UBO) 1 MatrixStride 16
-                              MemberDecorate 100(UBO) 2 Offset 128
-                              MemberDecorate 100(UBO) 3 Offset 144
-                              MemberDecorate 100(UBO) 4 Offset 240
-                              MemberDecorate 100(UBO) 5 Offset 244
-                              MemberDecorate 100(UBO) 6 Offset 248
-                              MemberDecorate 100(UBO) 7 Offset 256
-                              Decorate 100(UBO) Block
-                              Decorate 123(ubo) DescriptorSet 0
-                              Decorate 123(ubo) Binding 0
-                              MemberDecorate 242(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 242(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 242(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 242(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 242(gl_PerVertex) Block
-                              Decorate 264(gl_InvocationID) BuiltIn InvocationId
+                              Name 460  "param"
+                              Name 503  "gl_PerVertex"
+                              MemberName 503(gl_PerVertex) 0  "gl_Position"
+                              MemberName 503(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 503(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 503(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 516  "gl_out"
+                              Name 532  "outNormal"
+                              Name 542  "inNormal"
+                              Name 557  "outUV"
+                              Decorate 95 ArrayStride 16
+                              MemberDecorate 99(UBO) 0 ColMajor
+                              MemberDecorate 99(UBO) 0 Offset 0
+                              MemberDecorate 99(UBO) 0 MatrixStride 16
+                              MemberDecorate 99(UBO) 1 ColMajor
+                              MemberDecorate 99(UBO) 1 Offset 64
+                              MemberDecorate 99(UBO) 1 MatrixStride 16
+                              MemberDecorate 99(UBO) 2 Offset 128
+                              MemberDecorate 99(UBO) 3 Offset 144
+                              MemberDecorate 99(UBO) 4 Offset 240
+                              MemberDecorate 99(UBO) 5 Offset 244
+                              MemberDecorate 99(UBO) 6 Offset 248
+                              MemberDecorate 99(UBO) 7 Offset 256
+                              Decorate 99(UBO) Block
+                              Decorate 122(ubo) DescriptorSet 0
+                              Decorate 122(ubo) Binding 0
+                              MemberDecorate 243(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 243(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 243(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 243(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 243(gl_PerVertex) Block
+                              Decorate 265(gl_InvocationID) BuiltIn InvocationId
                               Decorate 285(samplerHeight) DescriptorSet 0
                               Decorate 285(samplerHeight) Binding 1
-                              Decorate 293(inUV) Location 1
-                              Decorate 381(gl_TessLevelInner) Patch
-                              Decorate 381(gl_TessLevelInner) BuiltIn TessLevelInner
-                              Decorate 396(gl_TessLevelOuter) Patch
-                              Decorate 396(gl_TessLevelOuter) BuiltIn TessLevelOuter
-                              MemberDecorate 499(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 499(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 499(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 499(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 499(gl_PerVertex) Block
-                              Decorate 527(outNormal) Location 0
-                              Decorate 535(inNormal) Location 0
-                              Decorate 552(outUV) Location 1
+                              Decorate 294(inUV) Location 1
+                              Decorate 383(gl_TessLevelInner) Patch
+                              Decorate 383(gl_TessLevelInner) BuiltIn TessLevelInner
+                              Decorate 399(gl_TessLevelOuter) Patch
+                              Decorate 399(gl_TessLevelOuter) BuiltIn TessLevelOuter
+                              MemberDecorate 503(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 503(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 503(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 503(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 503(gl_PerVertex) Block
+                              Decorate 532(outNormal) Location 0
+                              Decorate 542(inNormal) Location 0
+                              Decorate 557(outUV) Location 1
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
               16:             TypeFloat 32
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 17 10 13 12
               19:             TypeVector 16(float) 4
               20:      7(int) Constant 4
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 20
               22:             TypePointer Function 19(fvec4)
               23:      7(int) Constant 7
-              24:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 23 12
+              24:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 23 12
               25:             TypeFunction 16(float) 22(ptr) 22(ptr)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 21
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 34
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 18 21 21
+              33:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 34
               35:      7(int) Constant 51
               37:      7(int) Constant 1
               38:      7(int) Constant 2
-              36:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 37 20 33 38
-              32:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 31 26 33 35 12 36 31 13 35
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 42 21 33 35 12 32 20 37
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 46 21 33 35 12 32 20 38
+              36:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 37 20 33 38
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 31 26 33 35 12 36 31 13 35
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 40 21 33 35 12 32 20 37
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              45:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 46 21 33 35 12 32 20 38
               48:             TypeBool
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 49 10 38 12
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 49 10 38 12
               51:             TypeFunction 48(bool)
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 50
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 50
               57:      7(int) Constant 81
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 55 52 33 57 12 36 55 13 57
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 55 52 33 57 12 36 55 13 57
               60:      7(int) Constant 98
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 58 6 33 60 12 36 58 13 60
-              64:      7(int) Constant 54
-              66:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 67 21 33 64 12 32 20
-              69:   16(float) Constant 1056964608
-              75:      7(int) Constant 56
-              76:             TypePointer Function 16(float)
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 23 12
-              79:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 80 18 33 75 12 32 20
-              85:   16(float) Constant 1073741824
-              88:      7(int) Constant 59
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 91 21 33 88 12 32 20
-              93:             TypeMatrix 19(fvec4) 4
-              95:    48(bool) ConstantTrue
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 21 20 95
-              96:             TypeArray 19(fvec4) 11
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 21 11
-              98:             TypeVector 16(float) 2
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 38
-        100(UBO):             TypeStruct 93 93 19(fvec4) 96 16(float) 16(float) 98(fvec2) 16(float)
-             103:      7(int) Constant 30
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 102 94 33 103 23 12 12 13
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 102 94 33 103 23 12 12 13
-             107:      7(int) Constant 31
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 106 21 33 107 23 12 12 13
-             108:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 109 97 33 10 23 12 12 13
-             112:      7(int) Constant 36
-             113:      7(int) Constant 8
-             110:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 111 18 33 112 113 12 12 13
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 111 18 33 112 113 12 12 13
-             117:      7(int) Constant 35
-             115:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 116 99 33 117 23 12 12 13
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 111 18 33 112 113 12 12 13
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 120 37 33 88 12 36 120 12 13 101 104 105 108 110 114 115 118
-             121:             TypePointer Uniform 100(UBO)
-             122:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 119 38 12
-        123(ubo):    121(ptr) Variable Uniform
-             124:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 125 119 33 88 12 36 125 123(ubo) 113
-             126:             TypeInt 32 1
-             128:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 127 10 20 12
-             129:    126(int) Constant 1
-             130:             TypePointer Uniform 93
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 94 38 12
-             137:      7(int) Constant 62
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 140 21 33 137 12 32 20
-             142:    126(int) Constant 0
-             147:             TypeVector 16(float) 3
-             148:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
-             149:   16(float) Constant 0
-             150:  147(fvec3) ConstantComposite 149 149 149
-             158:      7(int) Constant 63
-             160:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 161 21 33 158 12 32 20
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 58 6 33 60 12 36 58 13 60
+              65:      7(int) Constant 54
+              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 64 21 33 65 12 32 20
+              68:   16(float) Constant 1056964608
+              73:             TypePointer Function 16(float)
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 23 12
+              78:      7(int) Constant 56
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 77 18 33 78 12 32 20
+              84:   16(float) Constant 1073741824
+              89:      7(int) Constant 59
+              87:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 88 21 33 89 12 32 20
+              92:             TypeMatrix 19(fvec4) 4
+              94:    48(bool) ConstantTrue
+              93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 21 20 94
+              95:             TypeArray 19(fvec4) 11
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 21 11
+              97:             TypeVector 16(float) 2
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 38
+         99(UBO):             TypeStruct 92 92 19(fvec4) 95 16(float) 16(float) 97(fvec2) 16(float)
+             102:      7(int) Constant 30
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 101 93 33 102 23 12 12 13
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 101 93 33 102 23 12 12 13
+             106:      7(int) Constant 31
+             104:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 105 21 33 106 23 12 12 13
+             107:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 108 96 33 10 23 12 12 13
+             111:      7(int) Constant 36
+             112:      7(int) Constant 8
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 110 18 33 111 112 12 12 13
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 110 18 33 111 112 12 12 13
+             116:      7(int) Constant 35
+             114:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 115 98 33 116 23 12 12 13
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 110 18 33 111 112 12 12 13
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 119 37 33 89 12 36 119 12 13 100 103 104 107 109 113 114 117
+             120:             TypePointer Uniform 99(UBO)
+             121:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 118 38 12
+        122(ubo):    120(ptr) Variable Uniform
+             123:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 124 118 33 89 12 36 124 122(ubo) 112
+             125:             TypeInt 32 1
+             127:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 126 10 20 12
+             128:    125(int) Constant 1
+             129:             TypePointer Uniform 92
+             130:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 93 38 12
+             138:      7(int) Constant 62
+             136:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 137 21 33 138 12 32 20
+             141:    125(int) Constant 0
+             146:             TypeVector 16(float) 3
+             147:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 18 13
+             148:   16(float) Constant 0
+             149:  146(fvec3) ConstantComposite 148 148 148
+             159:      7(int) Constant 63
+             157:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 158 21 33 159 12 32 20
              174:      7(int) Constant 66
              181:      7(int) Constant 67
-             188:      7(int) Constant 70
-             189:    126(int) Constant 6
-             190:             TypePointer Uniform 98(fvec2)
-             191:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 99 38 12
+             186:    125(int) Constant 6
+             187:             TypePointer Uniform 97(fvec2)
+             188:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 38 12
+             191:      7(int) Constant 70
              202:      7(int) Constant 71
              213:      7(int) Constant 76
-             217:    126(int) Constant 7
-             218:             TypePointer Uniform 16(float)
-             219:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 38 12
-             223:    126(int) Constant 5
-             227:   16(float) Constant 1065353216
-             228:   16(float) Constant 1115684864
-             235:      7(int) Constant 85
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 238 21 33 235 12 56 20
-             240:             TypeArray 16(float) 37
-             241:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 37
-242(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 240 240
-             245:      7(int) Constant 1756
-             243:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 244 21 33 37 245 12 12 13
-             248:      7(int) Constant 1774
-             246:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 247 18 33 37 248 12 12 13
-             251:      7(int) Constant 1817
-             249:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 250 241 33 37 251 12 12 13
-             252:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 250 241 33 37 251 12 12 13
-             253:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 254 37 33 235 12 36 254 12 13 243 246 249 252
-             255:             TypeArray 242(gl_PerVertex) 10
-             256:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 253 10
-             257:             TypePointer Input 255
-             258:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 256 37 12
-      259(gl_in):    257(ptr) Variable Input
-             260:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 261 256 33 235 12 36 261 259(gl_in) 113
-             262:             TypePointer Input 126(int)
-             263:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 128 37 12
-264(gl_InvocationID):    262(ptr) Variable Input
-             265:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 266 128 33 235 12 36 266 264(gl_InvocationID) 113
-             268:             TypePointer Input 19(fvec4)
-             269:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 37 12
-             273:      7(int) Constant 86
-             274:             TypeImage 16(float) 2D sampled format:Unknown
-             278:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             275:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 276 12 33 273 12 36 277 278 13
-             279:             TypeSampledImage 274
-             280:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 281 12 33 273 12 36 282 278 13
+             216:    125(int) Constant 7
+             217:             TypePointer Uniform 16(float)
+             218:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 38 12
+             222:    125(int) Constant 5
+             226:   16(float) Constant 1065353216
+             227:   16(float) Constant 1115684864
+             238:      7(int) Constant 85
+             236:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 237 21 33 238 12 56 20
+             241:             TypeArray 16(float) 37
+             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 37
+243(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 241 241
+             246:      7(int) Constant 1756
+             244:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 245 21 33 37 246 12 12 13
+             249:      7(int) Constant 1774
+             247:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 248 18 33 37 249 12 12 13
+             252:      7(int) Constant 1817
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 251 242 33 37 252 12 12 13
+             253:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 251 242 33 37 252 12 12 13
+             254:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 255 37 33 238 12 36 255 12 13 244 247 250 253
+             256:             TypeArray 243(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 37 12
+      260(gl_in):    258(ptr) Variable Input
+             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 262 257 33 238 12 36 262 260(gl_in) 112
+             263:             TypePointer Input 125(int)
+             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 127 37 12
+265(gl_InvocationID):    263(ptr) Variable Input
+             266:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 267 127 33 238 12 36 267 265(gl_InvocationID) 112
+             269:             TypePointer Input 19(fvec4)
+             270:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 37 12
+             273:             TypeImage 16(float) 2D sampled format:Unknown
+             276:      7(int) Constant 86
+             278:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 275 12 33 276 12 36 277 278 13
+             279:             TypeSampledImage 273
+             280:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 281 12 33 276 12 36 282 278 13
              283:             TypePointer UniformConstant 279
-             284:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 280 12 12
+             284:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 280 12 12
 285(samplerHeight):    283(ptr) Variable UniformConstant
-             286:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 287 280 33 273 12 36 287 285(samplerHeight) 113
-             289:             TypeArray 98(fvec2) 10
-             290:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 99 10
-             291:             TypePointer Input 289
-             292:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 290 37 12
-       293(inUV):    291(ptr) Variable Input
-             294:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 295 290 33 273 12 36 295 293(inUV) 113
-             296:             TypePointer Input 98(fvec2)
-             297:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 99 37 12
-             302:    126(int) Constant 4
-             311:      7(int) Constant 89
-             312:             TypePointer Function 126(int)
-             313:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 128 23 12
-             315:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 316 128 33 311 12 56 20
-             331:      7(int) Constant 90
-             333:    126(int) Constant 3
-             335:             TypePointer Uniform 19(fvec4)
-             336:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 38 12
-             340:   16(float) Constant 1090519040
-             345:    48(bool) ConstantFalse
-             348:      7(int) Constant 92
-             356:      7(int) Constant 95
-             362:      7(int) Constant 100
-             369:      7(int) Constant 102
-             376:      7(int) Constant 104
-             377:             TypeArray 16(float) 38
-             378:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 38
-             379:             TypePointer Output 377
-             380:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 378 13 12
-381(gl_TessLevelInner):    379(ptr) Variable Output
-             382:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 383 378 33 376 12 36 383 381(gl_TessLevelInner) 113
-             384:             TypePointer Output 16(float)
-             385:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
-             388:      7(int) Constant 105
-             391:      7(int) Constant 106
-             392:             TypeArray 16(float) 20
-             393:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 20
-             394:             TypePointer Output 392
-             395:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 393 13 12
-396(gl_TessLevelOuter):    394(ptr) Variable Output
-             397:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 398 393 33 391 12 36 398 396(gl_TessLevelOuter) 113
-             401:      7(int) Constant 107
-             404:      7(int) Constant 108
-             405:    126(int) Constant 2
-             408:      7(int) Constant 109
-             413:      7(int) Constant 113
-             421:      7(int) Constant 115
-             431:      7(int) Constant 116
-             441:      7(int) Constant 117
-             451:      7(int) Constant 118
-             461:      7(int) Constant 119
-             469:      7(int) Constant 120
-             479:      7(int) Constant 126
-             482:      7(int) Constant 127
-             485:      7(int) Constant 128
-             488:      7(int) Constant 129
-             491:      7(int) Constant 130
-             494:      7(int) Constant 131
-             498:      7(int) Constant 137
-499(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 240 240
-             501:      7(int) Constant 110
-             500:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 244 21 33 37 501 12 12 13
-             502:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 247 18 33 37 485 12 12 13
-             504:      7(int) Constant 171
-             503:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 250 241 33 37 504 12 12 13
-             505:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 250 241 33 37 504 12 12 13
-             506:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 254 37 33 498 12 36 254 12 13 500 502 503 505
-             507:             TypeArray 499(gl_PerVertex) 20
-             508:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 506 20
-             509:             TypePointer Output 507
-             510:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 508 13 12
-     511(gl_out):    509(ptr) Variable Output
-             512:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 513 508 33 498 12 36 513 511(gl_out) 113
-             518:             TypePointer Output 19(fvec4)
-             519:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
-             522:      7(int) Constant 138
-             523:             TypeArray 147(fvec3) 20
-             524:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 148 20
-             525:             TypePointer Output 523
-             526:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 524 13 12
-  527(outNormal):    525(ptr) Variable Output
-             528:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 529 524 33 522 12 36 529 527(outNormal) 113
-             531:             TypeArray 147(fvec3) 10
-             532:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 148 10
-             533:             TypePointer Input 531
-             534:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 532 37 12
-   535(inNormal):    533(ptr) Variable Input
-             536:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 537 532 33 522 12 36 537 535(inNormal) 113
-             539:             TypePointer Input 147(fvec3)
-             540:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 148 37 12
-             543:             TypePointer Output 147(fvec3)
-             544:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 148 13 12
-             547:      7(int) Constant 139
-             548:             TypeArray 98(fvec2) 20
-             549:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 99 20
-             550:             TypePointer Output 548
-             551:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 549 13 12
-      552(outUV):    550(ptr) Variable Output
-             553:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 554 549 33 547 12 36 554 552(outUV) 113
-             559:             TypePointer Output 98(fvec2)
-             560:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 99 13 12
-                              Line 1 98 11
+             286:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 287 280 33 276 12 36 287 285(samplerHeight) 112
+             290:             TypeArray 97(fvec2) 10
+             291:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 98 10
+             292:             TypePointer Input 290
+             293:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 291 37 12
+       294(inUV):    292(ptr) Variable Input
+             295:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 296 291 33 276 12 36 296 294(inUV) 112
+             297:             TypePointer Input 97(fvec2)
+             298:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 37 12
+             303:    125(int) Constant 4
+             311:             TypePointer Function 125(int)
+             312:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 127 23 12
+             316:      7(int) Constant 89
+             314:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 315 127 33 316 12 56 20
+             333:      7(int) Constant 90
+             334:    125(int) Constant 3
+             336:             TypePointer Uniform 19(fvec4)
+             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 38 12
+             341:   16(float) Constant 1090519040
+             346:    48(bool) ConstantFalse
+             349:      7(int) Constant 92
+             359:      7(int) Constant 95
+             368:      7(int) Constant 100
+             375:      7(int) Constant 102
+             379:             TypeArray 16(float) 38
+             380:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 38
+             381:             TypePointer Output 379
+             382:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 380 13 12
+383(gl_TessLevelInner):    381(ptr) Variable Output
+             386:      7(int) Constant 104
+             384:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 385 380 33 386 12 36 385 383(gl_TessLevelInner) 112
+             387:             TypePointer Output 16(float)
+             388:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 18 13 12
+             394:      7(int) Constant 105
+             395:             TypeArray 16(float) 20
+             396:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 18 20
+             397:             TypePointer Output 395
+             398:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 396 13 12
+399(gl_TessLevelOuter):    397(ptr) Variable Output
+             402:      7(int) Constant 106
+             400:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 401 396 33 402 12 36 401 399(gl_TessLevelOuter) 112
+             407:      7(int) Constant 107
+             408:    125(int) Constant 2
+             411:      7(int) Constant 108
+             414:      7(int) Constant 109
+             419:      7(int) Constant 113
+             428:      7(int) Constant 115
+             438:      7(int) Constant 116
+             448:      7(int) Constant 117
+             458:      7(int) Constant 118
+             467:      7(int) Constant 119
+             475:      7(int) Constant 120
+             485:      7(int) Constant 126
+             488:      7(int) Constant 127
+             491:      7(int) Constant 128
+             494:      7(int) Constant 129
+             497:      7(int) Constant 130
+             500:      7(int) Constant 131
+503(gl_PerVertex):             TypeStruct 19(fvec4) 16(float) 241 241
+             505:      7(int) Constant 110
+             504:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 245 21 33 37 505 12 12 13
+             506:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 248 18 33 37 491 12 12 13
+             508:      7(int) Constant 171
+             507:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 251 242 33 37 508 12 12 13
+             509:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 251 242 33 37 508 12 12 13
+             511:      7(int) Constant 137
+             510:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 255 37 33 511 12 36 255 12 13 504 506 507 509
+             512:             TypeArray 503(gl_PerVertex) 20
+             513:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 510 20
+             514:             TypePointer Output 512
+             515:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 513 13 12
+     516(gl_out):    514(ptr) Variable Output
+             517:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 518 513 33 511 12 36 518 516(gl_out) 112
+             525:             TypePointer Output 19(fvec4)
+             526:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 21 13 12
+             528:             TypeArray 146(fvec3) 20
+             529:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 147 20
+             530:             TypePointer Output 528
+             531:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 529 13 12
+  532(outNormal):    530(ptr) Variable Output
+             535:      7(int) Constant 138
+             533:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 534 529 33 535 12 36 534 532(outNormal) 112
+             538:             TypeArray 146(fvec3) 10
+             539:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 147 10
+             540:             TypePointer Input 538
+             541:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 539 37 12
+   542(inNormal):    540(ptr) Variable Input
+             543:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 544 539 33 535 12 36 544 542(inNormal) 112
+             546:             TypePointer Input 146(fvec3)
+             547:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 147 37 12
+             550:             TypePointer Output 146(fvec3)
+             551:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 147 13 12
+             553:             TypeArray 97(fvec2) 20
+             554:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 98 20
+             555:             TypePointer Output 553
+             556:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 554 13 12
+      557(outUV):    555(ptr) Variable Output
+             560:      7(int) Constant 139
+             558:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 559 554 33 560 12 36 559 557(outUV) 112
+             566:             TypePointer Output 97(fvec2)
+             567:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 98 13 12
         14(main):           4 Function None 5
               15:             Label
-      422(param):     22(ptr) Variable Function
-      425(param):     22(ptr) Variable Function
-      432(param):     22(ptr) Variable Function
+      424(param):     22(ptr) Variable Function
+      430(param):     22(ptr) Variable Function
       435(param):     22(ptr) Variable Function
-      442(param):     22(ptr) Variable Function
+      440(param):     22(ptr) Variable Function
       445(param):     22(ptr) Variable Function
-      452(param):     22(ptr) Variable Function
+      450(param):     22(ptr) Variable Function
       455(param):     22(ptr) Variable Function
-             359:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 59 14(main)
-             360:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             361:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 362 362 12 12
-             363:    126(int) Load 264(gl_InvocationID)
-             364:    48(bool) IEqual 363 142
-                              SelectionMerge 366 None
-                              BranchConditional 364 365 366
-             365:               Label
-             367:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             368:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 369 369 12 12
-             370:    48(bool)   FunctionCall 53(frustumCheck()
-             371:    48(bool)   LogicalNot 370
-                                SelectionMerge 373 None
-                                BranchConditional 371 372 410
-             372:                 Label
-             374:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             375:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 376 376 12 12
-             386:    384(ptr)     AccessChain 381(gl_TessLevelInner) 142
-                                  Store 386 149
-             387:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 388 388 12 12
-             389:    384(ptr)     AccessChain 381(gl_TessLevelInner) 129
-                                  Store 389 149
-             390:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 391 391 12 12
-             399:    384(ptr)     AccessChain 396(gl_TessLevelOuter) 142
-                                  Store 399 149
-             400:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 401 401 12 12
-             402:    384(ptr)     AccessChain 396(gl_TessLevelOuter) 129
-                                  Store 402 149
-             403:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 404 404 12 12
-             406:    384(ptr)     AccessChain 396(gl_TessLevelOuter) 405
-                                  Store 406 149
-             407:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 408 408 12 12
-             409:    384(ptr)     AccessChain 396(gl_TessLevelOuter) 333
-                                  Store 409 149
-                                  Branch 373
-             410:                 Label
-             411:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             412:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 413 413 12 12
-             414:    218(ptr)     AccessChain 123(ubo) 223
-             415:   16(float)     Load 414
-             416:    48(bool)     FOrdGreaterThan 415 149
-                                  SelectionMerge 418 None
-                                  BranchConditional 416 417 476
-             417:                   Label
-             419:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             420:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 421 421 12 12
-             423:    268(ptr)       AccessChain 259(gl_in) 333 142
-             424:   19(fvec4)       Load 423
-                                    Store 422(param) 424
-             426:    268(ptr)       AccessChain 259(gl_in) 142 142
-             427:   19(fvec4)       Load 426
-                                    Store 425(param) 427
-             428:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 422(param) 425(param)
-             429:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 142
-                                    Store 429 428
-             430:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 431 431 12 12
-             433:    268(ptr)       AccessChain 259(gl_in) 142 142
-             434:   19(fvec4)       Load 433
-                                    Store 432(param) 434
-             436:    268(ptr)       AccessChain 259(gl_in) 129 142
-             437:   19(fvec4)       Load 436
-                                    Store 435(param) 437
-             438:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 432(param) 435(param)
-             439:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 129
-                                    Store 439 438
-             440:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 441 441 12 12
-             443:    268(ptr)       AccessChain 259(gl_in) 129 142
-             444:   19(fvec4)       Load 443
-                                    Store 442(param) 444
-             446:    268(ptr)       AccessChain 259(gl_in) 405 142
-             447:   19(fvec4)       Load 446
-                                    Store 445(param) 447
-             448:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 442(param) 445(param)
-             449:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 405
-                                    Store 449 448
-             450:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 451 451 12 12
-             453:    268(ptr)       AccessChain 259(gl_in) 405 142
-             454:   19(fvec4)       Load 453
-                                    Store 452(param) 454
-             456:    268(ptr)       AccessChain 259(gl_in) 333 142
-             457:   19(fvec4)       Load 456
-                                    Store 455(param) 457
-             458:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 452(param) 455(param)
-             459:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 333
-                                    Store 459 458
-             460:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 461 461 12 12
-             462:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 142
-             463:   16(float)       Load 462
-             464:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 333
-             465:   16(float)       Load 464
-             466:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 463 465 69
-             467:    384(ptr)       AccessChain 381(gl_TessLevelInner) 142
-                                    Store 467 466
-             468:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 469 469 12 12
-             470:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 405
-             471:   16(float)       Load 470
-             472:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 129
-             473:   16(float)       Load 472
-             474:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 471 473 69
-             475:    384(ptr)       AccessChain 381(gl_TessLevelInner) 129
-                                    Store 475 474
-                                    Branch 418
-             476:                   Label
-             477:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             478:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 479 479 12 12
-             480:    384(ptr)       AccessChain 381(gl_TessLevelInner) 142
-                                    Store 480 227
-             481:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 482 482 12 12
-             483:    384(ptr)       AccessChain 381(gl_TessLevelInner) 129
-                                    Store 483 227
-             484:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 485 485 12 12
-             486:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 142
-                                    Store 486 227
-             487:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 488 488 12 12
-             489:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 129
-                                    Store 489 227
-             490:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 491 491 12 12
-             492:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 405
-                                    Store 492 227
-             493:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 494 494 12 12
-             495:    384(ptr)       AccessChain 396(gl_TessLevelOuter) 333
-                                    Store 495 227
-                                    Branch 418
-             418:                 Label
-                                  Branch 373
-             373:               Label
-                                Branch 366
-             366:             Label
-             496:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
-             497:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 498 498 12 12
-             514:    126(int) Load 264(gl_InvocationID)
-             515:    126(int) Load 264(gl_InvocationID)
-             516:    268(ptr) AccessChain 259(gl_in) 515 142
-             517:   19(fvec4) Load 516
-             520:    518(ptr) AccessChain 511(gl_out) 514 142
-                              Store 520 517
-             521:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 522 522 12 12
-             530:    126(int) Load 264(gl_InvocationID)
-             538:    126(int) Load 264(gl_InvocationID)
-             541:    539(ptr) AccessChain 535(inNormal) 538
-             542:  147(fvec3) Load 541
-             545:    543(ptr) AccessChain 527(outNormal) 530
-                              Store 545 542
-             546:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 547 547 12 12
-             555:    126(int) Load 264(gl_InvocationID)
-             556:    126(int) Load 264(gl_InvocationID)
-             557:    296(ptr) AccessChain 293(inUV) 556
-             558:   98(fvec2) Load 557
-             561:    559(ptr) AccessChain 552(outUV) 555
-                              Store 561 558
+      460(param):     22(ptr) Variable Function
+             364:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             365:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 60 60 12 12
+             363:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 59 14(main)
+             367:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 368 368 12 12
+             366:    125(int) Load 265(gl_InvocationID)
+             369:    48(bool) IEqual 366 141
+                              SelectionMerge 371 None
+                              BranchConditional 369 370 371
+             370:               Label
+             373:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             374:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 375 375 12 12
+             372:    48(bool)   FunctionCall 53(frustumCheck()
+             376:    48(bool)   LogicalNot 372
+                                SelectionMerge 378 None
+                                BranchConditional 376 377 415
+             377:                 Label
+             390:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             391:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 386 386 12 12
+             389:    387(ptr)     AccessChain 383(gl_TessLevelInner) 141
+                                  Store 389 148
+             393:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 394 394 12 12
+             392:    387(ptr)     AccessChain 383(gl_TessLevelInner) 128
+                                  Store 392 148
+             404:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 402 402 12 12
+             403:    387(ptr)     AccessChain 399(gl_TessLevelOuter) 141
+                                  Store 403 148
+             406:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 407 407 12 12
+             405:    387(ptr)     AccessChain 399(gl_TessLevelOuter) 128
+                                  Store 405 148
+             410:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 411 411 12 12
+             409:    387(ptr)     AccessChain 399(gl_TessLevelOuter) 408
+                                  Store 409 148
+             413:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 414 414 12 12
+             412:    387(ptr)     AccessChain 399(gl_TessLevelOuter) 334
+                                  Store 412 148
+                                  Branch 378
+             415:                 Label
+             417:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             418:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 419 419 12 12
+             416:    217(ptr)     AccessChain 122(ubo) 222
+             420:   16(float)     Load 416
+             421:    48(bool)     FOrdGreaterThan 420 148
+                                  SelectionMerge 423 None
+                                  BranchConditional 421 422 481
+             422:                   Label
+             426:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             427:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 428 428 12 12
+             425:    269(ptr)       AccessChain 260(gl_in) 334 141
+             429:   19(fvec4)       Load 425
+                                    Store 424(param) 429
+             431:    269(ptr)       AccessChain 260(gl_in) 141 141
+             432:   19(fvec4)       Load 431
+                                    Store 430(param) 432
+             433:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 424(param) 430(param)
+             434:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 141
+                                    Store 434 433
+             437:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 438 438 12 12
+             436:    269(ptr)       AccessChain 260(gl_in) 141 141
+             439:   19(fvec4)       Load 436
+                                    Store 435(param) 439
+             441:    269(ptr)       AccessChain 260(gl_in) 128 141
+             442:   19(fvec4)       Load 441
+                                    Store 440(param) 442
+             443:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 435(param) 440(param)
+             444:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 128
+                                    Store 444 443
+             447:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 448 448 12 12
+             446:    269(ptr)       AccessChain 260(gl_in) 128 141
+             449:   19(fvec4)       Load 446
+                                    Store 445(param) 449
+             451:    269(ptr)       AccessChain 260(gl_in) 408 141
+             452:   19(fvec4)       Load 451
+                                    Store 450(param) 452
+             453:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 445(param) 450(param)
+             454:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 408
+                                    Store 454 453
+             457:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 458 458 12 12
+             456:    269(ptr)       AccessChain 260(gl_in) 408 141
+             459:   19(fvec4)       Load 456
+                                    Store 455(param) 459
+             461:    269(ptr)       AccessChain 260(gl_in) 334 141
+             462:   19(fvec4)       Load 461
+                                    Store 460(param) 462
+             463:   16(float)       FunctionCall 29(screenSpaceTessFactor(vf4;vf4;) 455(param) 460(param)
+             464:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 334
+                                    Store 464 463
+             466:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 467 467 12 12
+             465:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 141
+             468:   16(float)       Load 465
+             469:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 334
+             470:   16(float)       Load 469
+             471:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 468 470 68
+             472:    387(ptr)       AccessChain 383(gl_TessLevelInner) 141
+                                    Store 472 471
+             474:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 475 475 12 12
+             473:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 408
+             476:   16(float)       Load 473
+             477:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 128
+             478:   16(float)       Load 477
+             479:   16(float)       ExtInst 3(GLSL.std.450) 46(FMix) 476 478 68
+             480:    387(ptr)       AccessChain 383(gl_TessLevelInner) 128
+                                    Store 480 479
+                                    Branch 423
+             481:                   Label
+             483:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             484:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 485 485 12 12
+             482:    387(ptr)       AccessChain 383(gl_TessLevelInner) 141
+                                    Store 482 226
+             487:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 488 488 12 12
+             486:    387(ptr)       AccessChain 383(gl_TessLevelInner) 128
+                                    Store 486 226
+             490:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 491 491 12 12
+             489:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 141
+                                    Store 489 226
+             493:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 494 494 12 12
+             492:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 128
+                                    Store 492 226
+             496:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 497 497 12 12
+             495:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 408
+                                    Store 495 226
+             499:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 500 500 12 12
+             498:    387(ptr)       AccessChain 399(gl_TessLevelOuter) 334
+                                    Store 498 226
+                                    Branch 423
+             423:                 Label
+             501:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+                                  Branch 378
+             378:               Label
+             502:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+                                Branch 371
+             371:             Label
+             520:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 59
+             521:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 511 511 12 12
+             519:    125(int) Load 265(gl_InvocationID)
+             522:    125(int) Load 265(gl_InvocationID)
+             523:    269(ptr) AccessChain 260(gl_in) 522 141
+             524:   19(fvec4) Load 523
+             527:    525(ptr) AccessChain 516(gl_out) 519 141
+                              Store 527 524
+             537:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 535 535 12 12
+             536:    125(int) Load 265(gl_InvocationID)
+             545:    125(int) Load 265(gl_InvocationID)
+             548:    546(ptr) AccessChain 542(inNormal) 545
+             549:  146(fvec3) Load 548
+             552:    550(ptr) AccessChain 532(outNormal) 536
+                              Store 552 549
+             562:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 560 560 12 12
+             561:    125(int) Load 265(gl_InvocationID)
+             563:    125(int) Load 265(gl_InvocationID)
+             564:    297(ptr) AccessChain 294(inUV) 563
+             565:   97(fvec2) Load 564
+             568:    566(ptr) AccessChain 557(outUV) 561
+                              Store 568 565
                               Return
                               FunctionEnd
-                              Line 1 51 45
 29(screenSpaceTessFactor(vf4;vf4;):   16(float) Function None 25
           27(p0):     22(ptr) FunctionParameter
           28(p1):     22(ptr) FunctionParameter
               30:             Label
-    65(midPoint):     22(ptr) Variable Function
-      78(radius):     76(ptr) Variable Function
-          89(v0):     22(ptr) Variable Function
-      138(clip0):     22(ptr) Variable Function
-      159(clip1):     22(ptr) Variable Function
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 32
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 35 35 12 12
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 41 27(p0) 44
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 45 28(p1) 44
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 32 29(screenSpaceTessFactor(vf4;vf4;)
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 32
-              63:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 64 64 12 12
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 66 65(midPoint) 44
-              70:   19(fvec4) Load 27(p0)
-              71:   19(fvec4) Load 28(p1)
-              72:   19(fvec4) FAdd 70 71
-              73:   19(fvec4) VectorTimesScalar 72 69
-                              Store 65(midPoint) 73
-              74:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 75 75 12 12
-              81:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 79 78(radius) 44
-              82:   19(fvec4) Load 27(p0)
-              83:   19(fvec4) Load 28(p1)
-              84:   16(float) ExtInst 3(GLSL.std.450) 67(Distance) 82 83
-              86:   16(float) FDiv 84 85
-                              Store 78(radius) 86
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 88 88 12 12
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 90 89(v0) 44
-             132:    130(ptr) AccessChain 123(ubo) 129
-             133:          93 Load 132
-             134:   19(fvec4) Load 65(midPoint)
-             135:   19(fvec4) MatrixTimesVector 133 134
-                              Store 89(v0) 135
-             136:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 137 137 12 12
-             141:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 139 138(clip0) 44
-             143:    130(ptr) AccessChain 123(ubo) 142
-             144:          93 Load 143
-             145:   19(fvec4) Load 89(v0)
-             146:   16(float) Load 78(radius)
-             151:   16(float) CompositeExtract 150 0
-             152:   16(float) CompositeExtract 150 1
-             153:   16(float) CompositeExtract 150 2
-             154:   19(fvec4) CompositeConstruct 146 151 152 153
-             155:   19(fvec4) FSub 145 154
-             156:   19(fvec4) MatrixTimesVector 144 155
-                              Store 138(clip0) 156
-             157:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 158 158 12 12
-             162:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 160 159(clip1) 44
-             163:    130(ptr) AccessChain 123(ubo) 142
-             164:          93 Load 163
-             165:   19(fvec4) Load 89(v0)
-             166:   16(float) Load 78(radius)
-             167:   16(float) CompositeExtract 150 0
-             168:   16(float) CompositeExtract 150 1
-             169:   16(float) CompositeExtract 150 2
-             170:   19(fvec4) CompositeConstruct 166 167 168 169
-             171:   19(fvec4) FAdd 165 170
-             172:   19(fvec4) MatrixTimesVector 164 171
-                              Store 159(clip1) 172
-             173:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 174 174 12 12
-             175:     76(ptr) AccessChain 138(clip0) 13
-             176:   16(float) Load 175
-             177:   19(fvec4) Load 138(clip0)
-             178:   19(fvec4) CompositeConstruct 176 176 176 176
-             179:   19(fvec4) FDiv 177 178
-                              Store 138(clip0) 179
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 181 181 12 12
-             182:     76(ptr) AccessChain 159(clip1) 13
-             183:   16(float) Load 182
-             184:   19(fvec4) Load 159(clip1)
-             185:   19(fvec4) CompositeConstruct 183 183 183 183
-             186:   19(fvec4) FDiv 184 185
-                              Store 159(clip1) 186
-             187:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 188 188 12 12
-             192:    190(ptr) AccessChain 123(ubo) 189
-             193:   98(fvec2) Load 192
-             194:   19(fvec4) Load 138(clip0)
-             195:   98(fvec2) VectorShuffle 194 194 0 1
-             196:   98(fvec2) FMul 195 193
-             197:     76(ptr) AccessChain 138(clip0) 12
-             198:   16(float) CompositeExtract 196 0
-                              Store 197 198
-             199:     76(ptr) AccessChain 138(clip0) 37
-             200:   16(float) CompositeExtract 196 1
-                              Store 199 200
-             201:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 202 202 12 12
-             203:    190(ptr) AccessChain 123(ubo) 189
-             204:   98(fvec2) Load 203
-             205:   19(fvec4) Load 159(clip1)
-             206:   98(fvec2) VectorShuffle 205 205 0 1
-             207:   98(fvec2) FMul 206 204
-             208:     76(ptr) AccessChain 159(clip1) 12
-             209:   16(float) CompositeExtract 207 0
-                              Store 208 209
-             210:     76(ptr) AccessChain 159(clip1) 37
-             211:   16(float) CompositeExtract 207 1
-                              Store 210 211
-             212:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 213 213 12 12
-             214:   19(fvec4) Load 138(clip0)
-             215:   19(fvec4) Load 159(clip1)
-             216:   16(float) ExtInst 3(GLSL.std.450) 67(Distance) 214 215
-             220:    218(ptr) AccessChain 123(ubo) 217
-             221:   16(float) Load 220
-             222:   16(float) FDiv 216 221
-             224:    218(ptr) AccessChain 123(ubo) 223
-             225:   16(float) Load 224
-             226:   16(float) FMul 222 225
-             229:   16(float) ExtInst 3(GLSL.std.450) 43(FClamp) 226 227 228
-                              ReturnValue 229
+    62(midPoint):     22(ptr) Variable Function
+      75(radius):     73(ptr) Variable Function
+          86(v0):     22(ptr) Variable Function
+      135(clip0):     22(ptr) Variable Function
+      156(clip1):     22(ptr) Variable Function
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 32
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 35 35 12 12
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 39 27(p0) 42
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 45 28(p1) 42
+              61:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 32 29(screenSpaceTessFactor(vf4;vf4;)
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 65 65 12 12
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 63 62(midPoint) 42
+              69:   19(fvec4) Load 27(p0)
+              70:   19(fvec4) Load 28(p1)
+              71:   19(fvec4) FAdd 69 70
+              72:   19(fvec4) VectorTimesScalar 71 68
+                              Store 62(midPoint) 72
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 78 78 12 12
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 76 75(radius) 42
+              81:   19(fvec4) Load 27(p0)
+              82:   19(fvec4) Load 28(p1)
+              83:   16(float) ExtInst 3(GLSL.std.450) 67(Distance) 81 82
+              85:   16(float) FDiv 83 84
+                              Store 75(radius) 85
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 89 89 12 12
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 87 86(v0) 42
+             131:    129(ptr) AccessChain 122(ubo) 128
+             132:          92 Load 131
+             133:   19(fvec4) Load 62(midPoint)
+             134:   19(fvec4) MatrixTimesVector 132 133
+                              Store 86(v0) 134
+             140:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 138 138 12 12
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 136 135(clip0) 42
+             142:    129(ptr) AccessChain 122(ubo) 141
+             143:          92 Load 142
+             144:   19(fvec4) Load 86(v0)
+             145:   16(float) Load 75(radius)
+             150:   16(float) CompositeExtract 149 0
+             151:   16(float) CompositeExtract 149 1
+             152:   16(float) CompositeExtract 149 2
+             153:   19(fvec4) CompositeConstruct 145 150 151 152
+             154:   19(fvec4) FSub 144 153
+             155:   19(fvec4) MatrixTimesVector 143 154
+                              Store 135(clip0) 155
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 159 159 12 12
+             160:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 157 156(clip1) 42
+             162:    129(ptr) AccessChain 122(ubo) 141
+             163:          92 Load 162
+             164:   19(fvec4) Load 86(v0)
+             165:   16(float) Load 75(radius)
+             166:   16(float) CompositeExtract 149 0
+             167:   16(float) CompositeExtract 149 1
+             168:   16(float) CompositeExtract 149 2
+             169:   19(fvec4) CompositeConstruct 165 166 167 168
+             170:   19(fvec4) FAdd 164 169
+             171:   19(fvec4) MatrixTimesVector 163 170
+                              Store 156(clip1) 171
+             173:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 174 174 12 12
+             172:     73(ptr) AccessChain 135(clip0) 13
+             175:   16(float) Load 172
+             176:   19(fvec4) Load 135(clip0)
+             177:   19(fvec4) CompositeConstruct 175 175 175 175
+             178:   19(fvec4) FDiv 176 177
+                              Store 135(clip0) 178
+             180:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 181 181 12 12
+             179:     73(ptr) AccessChain 156(clip1) 13
+             182:   16(float) Load 179
+             183:   19(fvec4) Load 156(clip1)
+             184:   19(fvec4) CompositeConstruct 182 182 182 182
+             185:   19(fvec4) FDiv 183 184
+                              Store 156(clip1) 185
+             190:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 191 191 12 12
+             189:    187(ptr) AccessChain 122(ubo) 186
+             192:   97(fvec2) Load 189
+             193:   19(fvec4) Load 135(clip0)
+             194:   97(fvec2) VectorShuffle 193 193 0 1
+             195:   97(fvec2) FMul 194 192
+             196:     73(ptr) AccessChain 135(clip0) 12
+             197:   16(float) CompositeExtract 195 0
+                              Store 196 197
+             198:     73(ptr) AccessChain 135(clip0) 37
+             199:   16(float) CompositeExtract 195 1
+                              Store 198 199
+             201:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 202 202 12 12
+             200:    187(ptr) AccessChain 122(ubo) 186
+             203:   97(fvec2) Load 200
+             204:   19(fvec4) Load 156(clip1)
+             205:   97(fvec2) VectorShuffle 204 204 0 1
+             206:   97(fvec2) FMul 205 203
+             207:     73(ptr) AccessChain 156(clip1) 12
+             208:   16(float) CompositeExtract 206 0
+                              Store 207 208
+             209:     73(ptr) AccessChain 156(clip1) 37
+             210:   16(float) CompositeExtract 206 1
+                              Store 209 210
+             212:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 213 213 12 12
+             211:   19(fvec4) Load 135(clip0)
+             214:   19(fvec4) Load 156(clip1)
+             215:   16(float) ExtInst 3(GLSL.std.450) 67(Distance) 211 214
+             219:    217(ptr) AccessChain 122(ubo) 216
+             220:   16(float) Load 219
+             221:   16(float) FDiv 215 220
+             223:    217(ptr) AccessChain 122(ubo) 222
+             224:   16(float) Load 223
+             225:   16(float) FMul 221 224
+             228:   16(float) ExtInst 3(GLSL.std.450) 43(FClamp) 225 226 227
+                              ReturnValue 228
                               FunctionEnd
-                              Line 1 81 19
 53(frustumCheck():    48(bool) Function None 51
               54:             Label
-        236(pos):     22(ptr) Variable Function
-          314(i):    312(ptr) Variable Function
-             232:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 56 53(frustumCheck()
-             233:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             234:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 235 235 12 12
-             239:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 237 236(pos) 44
-             267:    126(int) Load 264(gl_InvocationID)
-             270:    268(ptr) AccessChain 259(gl_in) 267 142
-             271:   19(fvec4) Load 270
-                              Store 236(pos) 271
-             272:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 273 273 12 12
+        235(pos):     22(ptr) Variable Function
+          313(i):    311(ptr) Variable Function
+             233:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             234:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 57 57 12 12
+             232:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 56 53(frustumCheck()
+             240:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 238 238 12 12
+             239:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 236 235(pos) 42
+             268:    125(int) Load 265(gl_InvocationID)
+             271:    269(ptr) AccessChain 260(gl_in) 268 141
+             272:   19(fvec4) Load 271
+                              Store 235(pos) 272
+             289:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 276 276 12 12
              288:         279 Load 285(samplerHeight)
-             298:    296(ptr) AccessChain 293(inUV) 142
-             299:   98(fvec2) Load 298
-             300:   19(fvec4) ImageSampleExplicitLod 288 299 Lod 149
-             301:   16(float) CompositeExtract 300 0
-             303:    218(ptr) AccessChain 123(ubo) 302
-             304:   16(float) Load 303
-             305:   16(float) FMul 301 304
-             306:     76(ptr) AccessChain 236(pos) 37
-             307:   16(float) Load 306
-             308:   16(float) FSub 307 305
-             309:     76(ptr) AccessChain 236(pos) 37
-                              Store 309 308
-             310:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 311 311 12 12
-             317:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 315 314(i) 44
-                              Store 314(i) 142
-                              Branch 318
-             318:             Label
-             322:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             323:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 311 311 12 12
-                              LoopMerge 320 321 None
-                              Branch 324
-             324:             Label
-             325:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             326:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 311 311 12 12
-             327:    126(int) Load 314(i)
-             328:    48(bool) SLessThan 327 189
-                              BranchConditional 328 319 320
-             319:               Label
-             329:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             330:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 331 331 12 12
-             332:   19(fvec4)   Load 236(pos)
-             334:    126(int)   Load 314(i)
-             337:    335(ptr)   AccessChain 123(ubo) 333 334
-             338:   19(fvec4)   Load 337
-             339:   16(float)   Dot 332 338
-             341:   16(float)   FAdd 339 340
-             342:    48(bool)   FOrdLessThan 341 149
-                                SelectionMerge 344 None
-                                BranchConditional 342 343 344
-             343:                 Label
-             346:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             347:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 348 348 12 12
-                                  ReturnValue 345
-             344:               Label
-                                Branch 321
-             321:               Label
-             350:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             351:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 311 311 12 12
-             352:    126(int)   Load 314(i)
-             353:    126(int)   IAdd 352 129
-                                Store 314(i) 353
-                                Branch 318
-             320:             Label
-             354:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
-             355:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 356 356 12 12
-                              ReturnValue 95
+             299:    297(ptr) AccessChain 294(inUV) 141
+             300:   97(fvec2) Load 299
+             301:   19(fvec4) ImageSampleExplicitLod 288 300 Lod 148
+             302:   16(float) CompositeExtract 301 0
+             304:    217(ptr) AccessChain 122(ubo) 303
+             305:   16(float) Load 304
+             306:   16(float) FMul 302 305
+             307:     73(ptr) AccessChain 235(pos) 37
+             308:   16(float) Load 307
+             309:   16(float) FSub 308 306
+             310:     73(ptr) AccessChain 235(pos) 37
+                              Store 310 309
+             318:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 316 316 12 12
+             317:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 314 313(i) 42
+                              Store 313(i) 141
+                              Branch 319
+             319:             Label
+             323:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 316 316 12 12
+                              LoopMerge 321 322 None
+                              Branch 325
+             325:             Label
+             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             328:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 316 316 12 12
+             326:    125(int) Load 313(i)
+             329:    48(bool) SLessThan 326 186
+                              BranchConditional 329 320 321
+             320:               Label
+             331:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             332:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 333 333 12 12
+             330:   19(fvec4)   Load 235(pos)
+             335:    125(int)   Load 313(i)
+             338:    336(ptr)   AccessChain 122(ubo) 334 335
+             339:   19(fvec4)   Load 338
+             340:   16(float)   Dot 330 339
+             342:   16(float)   FAdd 340 341
+             343:    48(bool)   FOrdLessThan 342 148
+                                SelectionMerge 345 None
+                                BranchConditional 343 344 345
+             344:                 Label
+             347:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             348:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 349 349 12 12
+                                  ReturnValue 346
+             345:               Label
+             352:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+                                Branch 322
+             322:               Label
+             354:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             355:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 316 316 12 12
+             353:    125(int)   Load 313(i)
+             356:    125(int)   IAdd 353 128
+                                Store 313(i) 356
+                                Branch 319
+             321:             Label
+             357:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 56
+             358:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 33 359 359 12 12
+                              ReturnValue 94
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.tese.out b/Test/baseResults/spv.debuginfo.glsl.tese.out
index c742d608..e16e274d 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tese.out
@@ -1,18 +1,18 @@
 spv.debuginfo.glsl.tese
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 355
+// Id's are bound by 356
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationEvaluation 14  "main" 46 65 94 115 144 182 300 316 324 337 344
+                              EntryPoint TessellationEvaluation 14  "main" 47 66 93 116 143 183 300 315 323 336 343
                               ExecutionMode 14 Quads
                               ExecutionMode 14 SpacingEqual
                               ExecutionMode 14 VertexOrderCw
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               16:             String  "main"
               19:             String  "// OpModuleProcessed auto-map-locations
@@ -23,446 +23,446 @@ spv.debuginfo.glsl.tese
 // OpModuleProcessed entry-point main
 #line 1
 "
-              30:             String  "float"
-              39:             String  "uv1"
-              48:             String  "inUV"
-              51:             String  "int"
-              67:             String  "gl_TessCoord"
-              78:             String  "uv2"
-              96:             String  "outUV"
-             109:             String  "n1"
-             117:             String  "inNormal"
-             130:             String  "n2"
-             146:             String  "outNormal"
-             161:             String  "pos1"
-             167:             String  "gl_Position"
-             170:             String  "gl_PointSize"
-             173:             String  "gl_CullDistance"
-             177:             String  "gl_PerVertex"
-             184:             String  "gl_in"
-             199:             String  "pos2"
-             213:             String  "pos"
-             225:             String  "type.2d.image"
+              29:             String  "float"
+              38:             String  "uv1"
+              49:             String  "inUV"
+              52:             String  "int"
+              68:             String  "gl_TessCoord"
+              77:             String  "uv2"
+              95:             String  "outUV"
+             108:             String  "n1"
+             118:             String  "inNormal"
+             129:             String  "n2"
+             145:             String  "outNormal"
+             160:             String  "pos1"
+             168:             String  "gl_Position"
+             171:             String  "gl_PointSize"
+             174:             String  "gl_CullDistance"
+             178:             String  "gl_PerVertex"
+             185:             String  "gl_in"
+             198:             String  "pos2"
+             212:             String  "pos"
+             224:             String  "type.2d.image"
              226:             String  "@type.2d.image"
              230:             String  "type.sampled.image"
              231:             String  "@type.sampled.image"
              236:             String  "displacementMap"
-             245:             String  "bool"
-             252:             String  "modelview"
-             256:             String  "lightPos"
-             259:             String  "frustumPlanes"
-             261:             String  "tessellatedEdgeSize"
-             265:             String  "viewportDim"
-             269:             String  "UBO"
-             274:             String  "ubo"
-             318:             String  "outViewVec"
-             326:             String  "outLightVec"
-             339:             String  "outWorldPos"
-             346:             String  "outEyePos"
+             246:             String  "bool"
+             253:             String  "modelview"
+             257:             String  "lightPos"
+             260:             String  "frustumPlanes"
+             262:             String  "tessellatedEdgeSize"
+             266:             String  "viewportDim"
+             270:             String  "UBO"
+             275:             String  "ubo"
+             317:             String  "outViewVec"
+             325:             String  "outLightVec"
+             338:             String  "outWorldPos"
+             345:             String  "outEyePos"
                               Name 14  "main"
-                              Name 37  "uv1"
-                              Name 46  "inUV"
-                              Name 65  "gl_TessCoord"
-                              Name 76  "uv2"
-                              Name 94  "outUV"
-                              Name 107  "n1"
-                              Name 115  "inNormal"
-                              Name 128  "n2"
-                              Name 144  "outNormal"
-                              Name 159  "pos1"
-                              Name 165  "gl_PerVertex"
-                              MemberName 165(gl_PerVertex) 0  "gl_Position"
-                              MemberName 165(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 165(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 165(gl_PerVertex) 3  "gl_CullDistance"
-                              Name 182  "gl_in"
-                              Name 197  "pos2"
-                              Name 211  "pos"
+                              Name 36  "uv1"
+                              Name 47  "inUV"
+                              Name 66  "gl_TessCoord"
+                              Name 75  "uv2"
+                              Name 93  "outUV"
+                              Name 106  "n1"
+                              Name 116  "inNormal"
+                              Name 127  "n2"
+                              Name 143  "outNormal"
+                              Name 158  "pos1"
+                              Name 166  "gl_PerVertex"
+                              MemberName 166(gl_PerVertex) 0  "gl_Position"
+                              MemberName 166(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 166(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 166(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 183  "gl_in"
+                              Name 196  "pos2"
+                              Name 210  "pos"
                               Name 234  "displacementMap"
-                              Name 250  "UBO"
-                              MemberName 250(UBO) 0  "projection"
-                              MemberName 250(UBO) 1  "modelview"
-                              MemberName 250(UBO) 2  "lightPos"
-                              MemberName 250(UBO) 3  "frustumPlanes"
-                              MemberName 250(UBO) 4  "displacementFactor"
-                              MemberName 250(UBO) 5  "tessellationFactor"
-                              MemberName 250(UBO) 6  "viewportDim"
-                              MemberName 250(UBO) 7  "tessellatedEdgeSize"
-                              Name 272  "ubo"
-                              Name 289  "gl_PerVertex"
-                              MemberName 289(gl_PerVertex) 0  "gl_Position"
-                              MemberName 289(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 289(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 289(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 251  "UBO"
+                              MemberName 251(UBO) 0  "projection"
+                              MemberName 251(UBO) 1  "modelview"
+                              MemberName 251(UBO) 2  "lightPos"
+                              MemberName 251(UBO) 3  "frustumPlanes"
+                              MemberName 251(UBO) 4  "displacementFactor"
+                              MemberName 251(UBO) 5  "tessellationFactor"
+                              MemberName 251(UBO) 6  "viewportDim"
+                              MemberName 251(UBO) 7  "tessellatedEdgeSize"
+                              Name 273  "ubo"
+                              Name 288  "gl_PerVertex"
+                              MemberName 288(gl_PerVertex) 0  "gl_Position"
+                              MemberName 288(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 288(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 288(gl_PerVertex) 3  "gl_CullDistance"
                               Name 300  ""
-                              Name 316  "outViewVec"
-                              Name 324  "outLightVec"
-                              Name 337  "outWorldPos"
-                              Name 344  "outEyePos"
-                              Decorate 46(inUV) Location 1
-                              Decorate 65(gl_TessCoord) BuiltIn TessCoord
-                              Decorate 94(outUV) Location 1
-                              Decorate 115(inNormal) Location 0
-                              Decorate 144(outNormal) Location 0
-                              MemberDecorate 165(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 165(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 165(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 165(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 165(gl_PerVertex) Block
+                              Name 315  "outViewVec"
+                              Name 323  "outLightVec"
+                              Name 336  "outWorldPos"
+                              Name 343  "outEyePos"
+                              Decorate 47(inUV) Location 1
+                              Decorate 66(gl_TessCoord) BuiltIn TessCoord
+                              Decorate 93(outUV) Location 1
+                              Decorate 116(inNormal) Location 0
+                              Decorate 143(outNormal) Location 0
+                              MemberDecorate 166(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 166(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 166(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 166(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 166(gl_PerVertex) Block
                               Decorate 234(displacementMap) DescriptorSet 0
                               Decorate 234(displacementMap) Binding 1
-                              Decorate 248 ArrayStride 16
-                              MemberDecorate 250(UBO) 0 ColMajor
-                              MemberDecorate 250(UBO) 0 Offset 0
-                              MemberDecorate 250(UBO) 0 MatrixStride 16
-                              MemberDecorate 250(UBO) 1 ColMajor
-                              MemberDecorate 250(UBO) 1 Offset 64
-                              MemberDecorate 250(UBO) 1 MatrixStride 16
-                              MemberDecorate 250(UBO) 2 Offset 128
-                              MemberDecorate 250(UBO) 3 Offset 144
-                              MemberDecorate 250(UBO) 4 Offset 240
-                              MemberDecorate 250(UBO) 5 Offset 244
-                              MemberDecorate 250(UBO) 6 Offset 248
-                              MemberDecorate 250(UBO) 7 Offset 256
-                              Decorate 250(UBO) Block
-                              Decorate 272(ubo) DescriptorSet 0
-                              Decorate 272(ubo) Binding 0
-                              MemberDecorate 289(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 289(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 289(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 289(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 289(gl_PerVertex) Block
-                              Decorate 316(outViewVec) Location 2
-                              Decorate 324(outLightVec) Location 3
-                              Decorate 337(outWorldPos) Location 5
-                              Decorate 344(outEyePos) Location 4
+                              Decorate 249 ArrayStride 16
+                              MemberDecorate 251(UBO) 0 ColMajor
+                              MemberDecorate 251(UBO) 0 Offset 0
+                              MemberDecorate 251(UBO) 0 MatrixStride 16
+                              MemberDecorate 251(UBO) 1 ColMajor
+                              MemberDecorate 251(UBO) 1 Offset 64
+                              MemberDecorate 251(UBO) 1 MatrixStride 16
+                              MemberDecorate 251(UBO) 2 Offset 128
+                              MemberDecorate 251(UBO) 3 Offset 144
+                              MemberDecorate 251(UBO) 4 Offset 240
+                              MemberDecorate 251(UBO) 5 Offset 244
+                              MemberDecorate 251(UBO) 6 Offset 248
+                              MemberDecorate 251(UBO) 7 Offset 256
+                              Decorate 251(UBO) Block
+                              Decorate 273(ubo) DescriptorSet 0
+                              Decorate 273(ubo) Binding 0
+                              MemberDecorate 288(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 288(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 288(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 288(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 288(gl_PerVertex) Block
+                              Decorate 315(outViewVec) Location 2
+                              Decorate 323(outLightVec) Location 3
+                              Decorate 336(outWorldPos) Location 5
+                              Decorate 343(outEyePos) Location 4
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 19
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               20:      7(int) Constant 53
               22:      7(int) Constant 1
               23:      7(int) Constant 4
               24:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
-              17:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
-              28:      7(int) Constant 56
-              29:             TypeFloat 32
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 30 10 13 12
-              32:             TypeVector 29(float) 2
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 24
-              34:             TypePointer Function 32(fvec2)
-              35:      7(int) Constant 7
-              36:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 35 12
-              38:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 39 33 18 28 12 17 23
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              42:             TypeArray 32(fvec2) 10
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 33 10
-              44:             TypePointer Input 42
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 43 22 12
-        46(inUV):     44(ptr) Variable Input
-              49:      7(int) Constant 8
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 48 43 18 28 12 21 48 46(inUV) 49
-              50:             TypeInt 32 1
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 51 10 23 12
-              53:     50(int) Constant 0
-              54:             TypePointer Input 32(fvec2)
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 22 12
-              58:     50(int) Constant 1
-              61:             TypeVector 29(float) 3
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 13
-              63:             TypePointer Input 61(fvec3)
-              64:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 62 22 12
-65(gl_TessCoord):     63(ptr) Variable Input
-              66:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 67 62 18 28 12 21 67 65(gl_TessCoord) 49
-              68:             TypePointer Input 29(float)
-              69:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 22 12
-              75:      7(int) Constant 57
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 78 33 18 75 12 17 23
-              80:     50(int) Constant 3
-              83:     50(int) Constant 2
-              91:      7(int) Constant 58
-              92:             TypePointer Output 32(fvec2)
-              93:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 13 12
-       94(outUV):     92(ptr) Variable Output
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 96 33 18 91 12 21 96 94(outUV) 49
-             104:      7(int) Constant 60
-             105:             TypePointer Function 61(fvec3)
-             106:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 62 35 12
-             108:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 109 62 18 104 12 17 23
-             111:             TypeArray 61(fvec3) 10
-             112:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 62 10
-             113:             TypePointer Input 111
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 112 22 12
-   115(inNormal):    113(ptr) Variable Input
-             116:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 117 112 18 104 12 21 117 115(inNormal) 49
-             127:      7(int) Constant 61
-             129:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 130 62 18 127 12 17 23
-             141:      7(int) Constant 62
-             142:             TypePointer Output 61(fvec3)
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 62 13 12
-  144(outNormal):    142(ptr) Variable Output
-             145:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 146 62 18 141 12 21 146 144(outNormal) 49
-             154:      7(int) Constant 65
-             155:             TypeVector 29(float) 4
-             156:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 23
-             157:             TypePointer Function 155(fvec4)
-             158:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 156 35 12
-             160:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 161 156 18 154 12 17 23
-             163:             TypeArray 29(float) 22
-             164:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 31 22
-165(gl_PerVertex):             TypeStruct 155(fvec4) 29(float) 163 163
-             168:      7(int) Constant 1756
-             166:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 156 18 22 168 12 12 13
-             171:      7(int) Constant 1774
-             169:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 170 31 18 22 171 12 12 13
-             174:      7(int) Constant 1817
-             172:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 22 174 12 12 13
-             175:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 22 174 12 12 13
-             176:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 177 22 18 154 12 21 177 12 13 166 169 172 175
-             178:             TypeArray 165(gl_PerVertex) 10
-             179:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 176 10
-             180:             TypePointer Input 178
-             181:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 179 22 12
-      182(gl_in):    180(ptr) Variable Input
-             183:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 184 179 18 154 12 21 184 182(gl_in) 49
-             185:             TypePointer Input 155(fvec4)
-             186:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 156 22 12
-             196:      7(int) Constant 66
-             198:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 199 156 18 196 12 17 23
-             210:      7(int) Constant 67
-             212:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 213 156 18 210 12 17 23
-             222:      7(int) Constant 69
-             223:             TypeImage 29(float) 2D sampled format:Unknown
-             227:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             224:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 225 12 18 222 12 21 226 227 13
-             228:             TypeSampledImage 223
-             229:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 230 12 18 222 12 21 231 227 13
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
+              17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
+              28:             TypeFloat 32
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 29 10 13 12
+              31:             TypeVector 28(float) 2
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 24
+              33:             TypePointer Function 31(fvec2)
+              34:      7(int) Constant 7
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 34 12
+              39:      7(int) Constant 56
+              37:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 38 32 18 39 12 17 23
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              43:             TypeArray 31(fvec2) 10
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 32 10
+              45:             TypePointer Input 43
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 44 22 12
+        47(inUV):     45(ptr) Variable Input
+              50:      7(int) Constant 8
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 49 44 18 39 12 21 49 47(inUV) 50
+              51:             TypeInt 32 1
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 52 10 23 12
+              54:     51(int) Constant 0
+              55:             TypePointer Input 31(fvec2)
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 22 12
+              59:     51(int) Constant 1
+              62:             TypeVector 28(float) 3
+              63:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 13
+              64:             TypePointer Input 62(fvec3)
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 22 12
+66(gl_TessCoord):     64(ptr) Variable Input
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 68 63 18 39 12 21 68 66(gl_TessCoord) 50
+              69:             TypePointer Input 28(float)
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 22 12
+              78:      7(int) Constant 57
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 77 32 18 78 12 17 23
+              81:     51(int) Constant 3
+              84:     51(int) Constant 2
+              91:             TypePointer Output 31(fvec2)
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 13 12
+       93(outUV):     91(ptr) Variable Output
+              96:      7(int) Constant 58
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 95 32 18 96 12 21 95 93(outUV) 50
+             104:             TypePointer Function 62(fvec3)
+             105:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 34 12
+             109:      7(int) Constant 60
+             107:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 108 63 18 109 12 17 23
+             112:             TypeArray 62(fvec3) 10
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 63 10
+             114:             TypePointer Input 112
+             115:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 113 22 12
+   116(inNormal):    114(ptr) Variable Input
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 118 113 18 109 12 21 118 116(inNormal) 50
+             130:      7(int) Constant 61
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 129 63 18 130 12 17 23
+             141:             TypePointer Output 62(fvec3)
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 63 13 12
+  143(outNormal):    141(ptr) Variable Output
+             146:      7(int) Constant 62
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 145 63 18 146 12 21 145 143(outNormal) 50
+             154:             TypeVector 28(float) 4
+             155:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 23
+             156:             TypePointer Function 154(fvec4)
+             157:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 155 34 12
+             161:      7(int) Constant 65
+             159:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 160 155 18 161 12 17 23
+             164:             TypeArray 28(float) 22
+             165:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 30 22
+166(gl_PerVertex):             TypeStruct 154(fvec4) 28(float) 164 164
+             169:      7(int) Constant 1756
+             167:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 168 155 18 22 169 12 12 13
+             172:      7(int) Constant 1774
+             170:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 171 30 18 22 172 12 12 13
+             175:      7(int) Constant 1817
+             173:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 174 165 18 22 175 12 12 13
+             176:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 174 165 18 22 175 12 12 13
+             177:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 178 22 18 161 12 21 178 12 13 167 170 173 176
+             179:             TypeArray 166(gl_PerVertex) 10
+             180:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 177 10
+             181:             TypePointer Input 179
+             182:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 180 22 12
+      183(gl_in):    181(ptr) Variable Input
+             184:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 185 180 18 161 12 21 185 183(gl_in) 50
+             186:             TypePointer Input 154(fvec4)
+             187:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 155 22 12
+             199:      7(int) Constant 66
+             197:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 198 155 18 199 12 17 23
+             213:      7(int) Constant 67
+             211:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 212 155 18 213 12 17 23
+             222:             TypeImage 28(float) 2D sampled format:Unknown
+             225:      7(int) Constant 69
+             227:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             223:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 224 12 18 225 12 21 226 227 13
+             228:             TypeSampledImage 222
+             229:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 230 12 18 225 12 21 231 227 13
              232:             TypePointer UniformConstant 228
-             233:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 229 12 12
+             233:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 229 12 12
 234(displacementMap):    232(ptr) Variable UniformConstant
-             235:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 236 229 18 222 12 21 236 234(displacementMap) 49
-             239:   29(float) Constant 0
-             242:             TypeMatrix 155(fvec4) 4
-             244:             TypeBool
-             246:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 245 10 24 12
-             247:   244(bool) ConstantTrue
-             243:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 156 23 247
-             248:             TypeArray 155(fvec4) 11
-             249:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 156 11
-        250(UBO):             TypeStruct 242 242 155(fvec4) 248 29(float) 29(float) 32(fvec2) 29(float)
-             253:      7(int) Constant 30
-             251:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 252 243 18 253 35 12 12 13
-             254:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 252 243 18 253 35 12 12 13
-             257:      7(int) Constant 31
-             255:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 256 156 18 257 35 12 12 13
-             258:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 259 249 18 10 35 12 12 13
-             262:      7(int) Constant 36
-             260:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 261 31 18 262 49 12 12 13
-             263:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 261 31 18 262 49 12 12 13
-             266:      7(int) Constant 35
-             264:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 265 33 18 266 35 12 12 13
-             267:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 261 31 18 262 49 12 12 13
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 269 22 18 222 12 21 269 12 13 251 254 255 258 260 263 264 267
-             270:             TypePointer Uniform 250(UBO)
-             271:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 268 24 12
-        272(ubo):    270(ptr) Variable Uniform
-             273:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 274 268 18 222 12 21 274 272(ubo) 49
-             275:     50(int) Constant 4
-             276:             TypePointer Uniform 29(float)
-             277:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 24 12
-             281:             TypePointer Function 29(float)
-             282:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 35 12
-             288:      7(int) Constant 71
-289(gl_PerVertex):             TypeStruct 155(fvec4) 29(float) 163 163
-             291:      7(int) Constant 165
-             290:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 167 156 18 22 291 12 12 13
-             293:      7(int) Constant 183
-             292:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 170 31 18 22 293 12 12 13
-             295:      7(int) Constant 226
-             294:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 22 295 12 12 13
-             296:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 173 164 18 22 295 12 12 13
-             297:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 177 22 18 288 12 21 177 12 13 290 292 294 296
-             298:             TypePointer Output 289(gl_PerVertex)
-             299:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 297 13 12
+             235:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 236 229 18 225 12 21 236 234(displacementMap) 50
+             240:   28(float) Constant 0
+             243:             TypeMatrix 154(fvec4) 4
+             245:             TypeBool
+             247:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 246 10 24 12
+             248:   245(bool) ConstantTrue
+             244:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 155 23 248
+             249:             TypeArray 154(fvec4) 11
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 155 11
+        251(UBO):             TypeStruct 243 243 154(fvec4) 249 28(float) 28(float) 31(fvec2) 28(float)
+             254:      7(int) Constant 30
+             252:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 253 244 18 254 34 12 12 13
+             255:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 253 244 18 254 34 12 12 13
+             258:      7(int) Constant 31
+             256:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 257 155 18 258 34 12 12 13
+             259:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 260 250 18 10 34 12 12 13
+             263:      7(int) Constant 36
+             261:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 262 30 18 263 50 12 12 13
+             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 262 30 18 263 50 12 12 13
+             267:      7(int) Constant 35
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 266 32 18 267 34 12 12 13
+             268:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 262 30 18 263 50 12 12 13
+             269:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 270 22 18 225 12 21 270 12 13 252 255 256 259 261 264 265 268
+             271:             TypePointer Uniform 251(UBO)
+             272:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 269 24 12
+        273(ubo):    271(ptr) Variable Uniform
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 275 269 18 225 12 21 275 273(ubo) 50
+             276:     51(int) Constant 4
+             277:             TypePointer Uniform 28(float)
+             278:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 24 12
+             282:             TypePointer Function 28(float)
+             283:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 34 12
+288(gl_PerVertex):             TypeStruct 154(fvec4) 28(float) 164 164
+             290:      7(int) Constant 165
+             289:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 168 155 18 22 290 12 12 13
+             292:      7(int) Constant 183
+             291:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 171 30 18 22 292 12 12 13
+             294:      7(int) Constant 226
+             293:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 174 165 18 22 294 12 12 13
+             295:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 174 165 18 22 294 12 12 13
+             297:      7(int) Constant 71
+             296:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 178 22 18 297 12 21 178 12 13 289 291 293 295
+             298:             TypePointer Output 288(gl_PerVertex)
+             299:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 296 13 12
              300:    298(ptr) Variable Output
-             301:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 297 18 288 12 21 1 300 49
-             302:             TypePointer Uniform 242
-             303:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 243 24 12
-             311:             TypePointer Output 155(fvec4)
-             312:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 156 13 12
-             315:      7(int) Constant 74
- 316(outViewVec):    142(ptr) Variable Output
-             317:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 318 62 18 315 12 21 318 316(outViewVec) 49
-             323:      7(int) Constant 75
-324(outLightVec):    142(ptr) Variable Output
-             325:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 326 62 18 323 12 21 326 324(outLightVec) 49
-             327:             TypePointer Uniform 155(fvec4)
-             328:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 156 24 12
-             336:      7(int) Constant 76
-337(outWorldPos):    142(ptr) Variable Output
-             338:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 339 62 18 336 12 21 339 337(outWorldPos) 49
-             343:      7(int) Constant 77
-  344(outEyePos):    142(ptr) Variable Output
-             345:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 346 62 18 343 12 21 346 344(outEyePos) 49
-                              Line 1 53 11
+             301:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 296 18 297 12 21 2 300 50
+             302:             TypePointer Uniform 243
+             303:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 244 24 12
+             312:             TypePointer Output 154(fvec4)
+             313:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 155 13 12
+ 315(outViewVec):    141(ptr) Variable Output
+             318:      7(int) Constant 74
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 317 63 18 318 12 21 317 315(outViewVec) 50
+323(outLightVec):    141(ptr) Variable Output
+             326:      7(int) Constant 75
+             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 325 63 18 326 12 21 325 323(outLightVec) 50
+             327:             TypePointer Uniform 154(fvec4)
+             328:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 155 24 12
+336(outWorldPos):    141(ptr) Variable Output
+             339:      7(int) Constant 76
+             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 338 63 18 339 12 21 338 336(outWorldPos) 50
+  343(outEyePos):    141(ptr) Variable Output
+             346:      7(int) Constant 77
+             344:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 345 63 18 346 12 21 345 343(outEyePos) 50
         14(main):           4 Function None 5
               15:             Label
-         37(uv1):     34(ptr) Variable Function
-         76(uv2):     34(ptr) Variable Function
-         107(n1):    105(ptr) Variable Function
-         128(n2):    105(ptr) Variable Function
-       159(pos1):    157(ptr) Variable Function
-       197(pos2):    157(ptr) Variable Function
-        211(pos):    157(ptr) Variable Function
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 38 37(uv1) 41
-              56:     54(ptr) AccessChain 46(inUV) 53
-              57:   32(fvec2) Load 56
-              59:     54(ptr) AccessChain 46(inUV) 58
-              60:   32(fvec2) Load 59
-              70:     68(ptr) AccessChain 65(gl_TessCoord) 12
-              71:   29(float) Load 70
-              72:   32(fvec2) CompositeConstruct 71 71
-              73:   32(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 57 60 72
-                              Store 37(uv1) 73
-              74:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 75 75 12 12
-              79:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 77 76(uv2) 41
-              81:     54(ptr) AccessChain 46(inUV) 80
-              82:   32(fvec2) Load 81
-              84:     54(ptr) AccessChain 46(inUV) 83
-              85:   32(fvec2) Load 84
-              86:     68(ptr) AccessChain 65(gl_TessCoord) 12
-              87:   29(float) Load 86
-              88:   32(fvec2) CompositeConstruct 87 87
-              89:   32(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 82 85 88
-                              Store 76(uv2) 89
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 91 91 12 12
-              97:   32(fvec2) Load 37(uv1)
-              98:   32(fvec2) Load 76(uv2)
-              99:     68(ptr) AccessChain 65(gl_TessCoord) 22
-             100:   29(float) Load 99
-             101:   32(fvec2) CompositeConstruct 100 100
-             102:   32(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 97 98 101
-                              Store 94(outUV) 102
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 104 104 12 12
-             110:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 108 107(n1) 41
-             118:     63(ptr) AccessChain 115(inNormal) 53
-             119:   61(fvec3) Load 118
-             120:     63(ptr) AccessChain 115(inNormal) 58
-             121:   61(fvec3) Load 120
-             122:     68(ptr) AccessChain 65(gl_TessCoord) 12
-             123:   29(float) Load 122
-             124:   61(fvec3) CompositeConstruct 123 123 123
-             125:   61(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 119 121 124
-                              Store 107(n1) 125
-             126:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 127 127 12 12
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 129 128(n2) 41
-             132:     63(ptr) AccessChain 115(inNormal) 80
-             133:   61(fvec3) Load 132
-             134:     63(ptr) AccessChain 115(inNormal) 83
-             135:   61(fvec3) Load 134
-             136:     68(ptr) AccessChain 65(gl_TessCoord) 12
-             137:   29(float) Load 136
-             138:   61(fvec3) CompositeConstruct 137 137 137
-             139:   61(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 133 135 138
-                              Store 128(n2) 139
-             140:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 141 141 12 12
-             147:   61(fvec3) Load 107(n1)
-             148:   61(fvec3) Load 128(n2)
-             149:     68(ptr) AccessChain 65(gl_TessCoord) 22
-             150:   29(float) Load 149
-             151:   61(fvec3) CompositeConstruct 150 150 150
-             152:   61(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 147 148 151
-                              Store 144(outNormal) 152
-             153:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 154 154 12 12
-             162:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 160 159(pos1) 41
-             187:    185(ptr) AccessChain 182(gl_in) 53 53
-             188:  155(fvec4) Load 187
-             189:    185(ptr) AccessChain 182(gl_in) 58 53
-             190:  155(fvec4) Load 189
-             191:     68(ptr) AccessChain 65(gl_TessCoord) 12
-             192:   29(float) Load 191
-             193:  155(fvec4) CompositeConstruct 192 192 192 192
-             194:  155(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 188 190 193
-                              Store 159(pos1) 194
-             195:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 196 196 12 12
-             200:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 198 197(pos2) 41
-             201:    185(ptr) AccessChain 182(gl_in) 80 53
-             202:  155(fvec4) Load 201
-             203:    185(ptr) AccessChain 182(gl_in) 83 53
-             204:  155(fvec4) Load 203
-             205:     68(ptr) AccessChain 65(gl_TessCoord) 12
-             206:   29(float) Load 205
-             207:  155(fvec4) CompositeConstruct 206 206 206 206
-             208:  155(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 202 204 207
-                              Store 197(pos2) 208
-             209:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 210 210 12 12
-             214:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 212 211(pos) 41
-             215:  155(fvec4) Load 159(pos1)
-             216:  155(fvec4) Load 197(pos2)
-             217:     68(ptr) AccessChain 65(gl_TessCoord) 22
-             218:   29(float) Load 217
-             219:  155(fvec4) CompositeConstruct 218 218 218 218
-             220:  155(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 215 216 219
-                              Store 211(pos) 220
-             221:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 222 222 12 12
+         36(uv1):     33(ptr) Variable Function
+         75(uv2):     33(ptr) Variable Function
+         106(n1):    104(ptr) Variable Function
+         127(n2):    104(ptr) Variable Function
+       158(pos1):    156(ptr) Variable Function
+       196(pos2):    156(ptr) Variable Function
+        210(pos):    156(ptr) Variable Function
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 39 39 12 12
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 37 36(uv1) 41
+              57:     55(ptr) AccessChain 47(inUV) 54
+              58:   31(fvec2) Load 57
+              60:     55(ptr) AccessChain 47(inUV) 59
+              61:   31(fvec2) Load 60
+              71:     69(ptr) AccessChain 66(gl_TessCoord) 12
+              72:   28(float) Load 71
+              73:   31(fvec2) CompositeConstruct 72 72
+              74:   31(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 58 61 73
+                              Store 36(uv1) 74
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 78 78 12 12
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 76 75(uv2) 41
+              82:     55(ptr) AccessChain 47(inUV) 81
+              83:   31(fvec2) Load 82
+              85:     55(ptr) AccessChain 47(inUV) 84
+              86:   31(fvec2) Load 85
+              87:     69(ptr) AccessChain 66(gl_TessCoord) 12
+              88:   28(float) Load 87
+              89:   31(fvec2) CompositeConstruct 88 88
+              90:   31(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 83 86 89
+                              Store 75(uv2) 90
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 96 96 12 12
+              97:   31(fvec2) Load 36(uv1)
+              99:   31(fvec2) Load 75(uv2)
+             100:     69(ptr) AccessChain 66(gl_TessCoord) 22
+             101:   28(float) Load 100
+             102:   31(fvec2) CompositeConstruct 101 101
+             103:   31(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 97 99 102
+                              Store 93(outUV) 103
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 109 109 12 12
+             110:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 107 106(n1) 41
+             119:     64(ptr) AccessChain 116(inNormal) 54
+             120:   62(fvec3) Load 119
+             121:     64(ptr) AccessChain 116(inNormal) 59
+             122:   62(fvec3) Load 121
+             123:     69(ptr) AccessChain 66(gl_TessCoord) 12
+             124:   28(float) Load 123
+             125:   62(fvec3) CompositeConstruct 124 124 124
+             126:   62(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 120 122 125
+                              Store 106(n1) 126
+             132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 130 130 12 12
+             131:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 128 127(n2) 41
+             133:     64(ptr) AccessChain 116(inNormal) 81
+             134:   62(fvec3) Load 133
+             135:     64(ptr) AccessChain 116(inNormal) 84
+             136:   62(fvec3) Load 135
+             137:     69(ptr) AccessChain 66(gl_TessCoord) 12
+             138:   28(float) Load 137
+             139:   62(fvec3) CompositeConstruct 138 138 138
+             140:   62(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 134 136 139
+                              Store 127(n2) 140
+             148:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 146 146 12 12
+             147:   62(fvec3) Load 106(n1)
+             149:   62(fvec3) Load 127(n2)
+             150:     69(ptr) AccessChain 66(gl_TessCoord) 22
+             151:   28(float) Load 150
+             152:   62(fvec3) CompositeConstruct 151 151 151
+             153:   62(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 147 149 152
+                              Store 143(outNormal) 153
+             163:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 161 161 12 12
+             162:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 159 158(pos1) 41
+             188:    186(ptr) AccessChain 183(gl_in) 54 54
+             189:  154(fvec4) Load 188
+             190:    186(ptr) AccessChain 183(gl_in) 59 54
+             191:  154(fvec4) Load 190
+             192:     69(ptr) AccessChain 66(gl_TessCoord) 12
+             193:   28(float) Load 192
+             194:  154(fvec4) CompositeConstruct 193 193 193 193
+             195:  154(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 189 191 194
+                              Store 158(pos1) 195
+             201:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 199 199 12 12
+             200:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 197 196(pos2) 41
+             202:    186(ptr) AccessChain 183(gl_in) 81 54
+             203:  154(fvec4) Load 202
+             204:    186(ptr) AccessChain 183(gl_in) 84 54
+             205:  154(fvec4) Load 204
+             206:     69(ptr) AccessChain 66(gl_TessCoord) 12
+             207:   28(float) Load 206
+             208:  154(fvec4) CompositeConstruct 207 207 207 207
+             209:  154(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 203 205 208
+                              Store 196(pos2) 209
+             215:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 213 213 12 12
+             214:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 211 210(pos) 41
+             216:  154(fvec4) Load 158(pos1)
+             217:  154(fvec4) Load 196(pos2)
+             218:     69(ptr) AccessChain 66(gl_TessCoord) 22
+             219:   28(float) Load 218
+             220:  154(fvec4) CompositeConstruct 219 219 219 219
+             221:  154(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 216 217 220
+                              Store 210(pos) 221
+             238:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 225 225 12 12
              237:         228 Load 234(displacementMap)
-             238:   32(fvec2) Load 94(outUV)
-             240:  155(fvec4) ImageSampleExplicitLod 237 238 Lod 239
-             241:   29(float) CompositeExtract 240 0
-             278:    276(ptr) AccessChain 272(ubo) 275
-             279:   29(float) Load 278
-             280:   29(float) FMul 241 279
-             283:    281(ptr) AccessChain 211(pos) 22
-             284:   29(float) Load 283
-             285:   29(float) FSub 284 280
-             286:    281(ptr) AccessChain 211(pos) 22
-                              Store 286 285
-             287:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 288 288 12 12
-             304:    302(ptr) AccessChain 272(ubo) 53
-             305:         242 Load 304
-             306:    302(ptr) AccessChain 272(ubo) 58
-             307:         242 Load 306
-             308:         242 MatrixTimesMatrix 305 307
-             309:  155(fvec4) Load 211(pos)
-             310:  155(fvec4) MatrixTimesVector 308 309
-             313:    311(ptr) AccessChain 300 53
-                              Store 313 310
-             314:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 315 315 12 12
-             319:  155(fvec4) Load 211(pos)
-             320:   61(fvec3) VectorShuffle 319 319 0 1 2
-             321:   61(fvec3) FNegate 320
-                              Store 316(outViewVec) 321
-             322:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 323 323 12 12
-             329:    327(ptr) AccessChain 272(ubo) 83
-             330:  155(fvec4) Load 329
-             331:   61(fvec3) VectorShuffle 330 330 0 1 2
-             332:   61(fvec3) Load 316(outViewVec)
-             333:   61(fvec3) FAdd 331 332
-             334:   61(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 333
-                              Store 324(outLightVec) 334
-             335:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 336 336 12 12
-             340:  155(fvec4) Load 211(pos)
-             341:   61(fvec3) VectorShuffle 340 340 0 1 2
-                              Store 337(outWorldPos) 341
-             342:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 343 343 12 12
-             347:    302(ptr) AccessChain 272(ubo) 58
-             348:         242 Load 347
-             349:  155(fvec4) Load 211(pos)
-             350:  155(fvec4) MatrixTimesVector 348 349
-             351:   29(float) CompositeExtract 350 0
-             352:   29(float) CompositeExtract 350 1
-             353:   29(float) CompositeExtract 350 2
-             354:   61(fvec3) CompositeConstruct 351 352 353
-                              Store 344(outEyePos) 354
+             239:   31(fvec2) Load 93(outUV)
+             241:  154(fvec4) ImageSampleExplicitLod 237 239 Lod 240
+             242:   28(float) CompositeExtract 241 0
+             279:    277(ptr) AccessChain 273(ubo) 276
+             280:   28(float) Load 279
+             281:   28(float) FMul 242 280
+             284:    282(ptr) AccessChain 210(pos) 22
+             285:   28(float) Load 284
+             286:   28(float) FSub 285 281
+             287:    282(ptr) AccessChain 210(pos) 22
+                              Store 287 286
+             305:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 297 297 12 12
+             304:    302(ptr) AccessChain 273(ubo) 54
+             306:         243 Load 304
+             307:    302(ptr) AccessChain 273(ubo) 59
+             308:         243 Load 307
+             309:         243 MatrixTimesMatrix 306 308
+             310:  154(fvec4) Load 210(pos)
+             311:  154(fvec4) MatrixTimesVector 309 310
+             314:    312(ptr) AccessChain 300 54
+                              Store 314 311
+             320:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 318 318 12 12
+             319:  154(fvec4) Load 210(pos)
+             321:   62(fvec3) VectorShuffle 319 319 0 1 2
+             322:   62(fvec3) FNegate 321
+                              Store 315(outViewVec) 322
+             330:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 326 326 12 12
+             329:    327(ptr) AccessChain 273(ubo) 84
+             331:  154(fvec4) Load 329
+             332:   62(fvec3) VectorShuffle 331 331 0 1 2
+             333:   62(fvec3) Load 315(outViewVec)
+             334:   62(fvec3) FAdd 332 333
+             335:   62(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 334
+                              Store 323(outLightVec) 335
+             341:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 339 339 12 12
+             340:  154(fvec4) Load 210(pos)
+             342:   62(fvec3) VectorShuffle 340 340 0 1 2
+                              Store 336(outWorldPos) 342
+             348:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 346 346 12 12
+             347:    302(ptr) AccessChain 273(ubo) 59
+             349:         243 Load 347
+             350:  154(fvec4) Load 210(pos)
+             351:  154(fvec4) MatrixTimesVector 349 350
+             352:   28(float) CompositeExtract 351 0
+             353:   28(float) CompositeExtract 351 1
+             354:   28(float) CompositeExtract 351 2
+             355:   62(fvec3) CompositeConstruct 352 353 354
+                              Store 343(outEyePos) 355
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.glsl.vert.out b/Test/baseResults/spv.debuginfo.glsl.vert.out
index b185b1d0..3b7aaeaa 100644
--- a/Test/baseResults/spv.debuginfo.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.glsl.vert.out
@@ -1,15 +1,15 @@
 spv.debuginfo.glsl.vert
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 443
+// Id's are bound by 444
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Vertex 14  "main" 36 42 48 55 64 82 304 322 327 353 371 388 428 437
-               1:             String  ""
+                              EntryPoint Vertex 14  "main" 35 42 47 55 65 83 305 323 328 353 370 389 427 436
+               2:             String  ""
                8:             String  "uint"
               16:             String  "main"
               19:             String  "// OpModuleProcessed auto-map-locations
@@ -20,541 +20,541 @@ spv.debuginfo.glsl.vert
 // OpModuleProcessed entry-point main
 #line 1
 "
-              30:             String  "float"
-              38:             String  "outColor"
+              29:             String  "float"
+              37:             String  "outColor"
               44:             String  "inColor"
-              50:             String  "outUV"
+              49:             String  "outUV"
               57:             String  "inUV"
-              60:             String  "int"
-              66:             String  "instanceTexIndex"
-              79:             String  "s"
-              84:             String  "instanceRot"
-              94:             String  "bool"
-              99:             String  "modelview"
-             103:             String  "lightPos"
-             106:             String  "globSpeed"
-             110:             String  "UBO"
-             115:             String  "ubo"
-             127:             String  "c"
-             143:             String  "mx"
-             187:             String  "my"
-             224:             String  "mz"
-             245:             String  "rotMat"
-             275:             String  "gRotMat"
-             302:             String  "locPos"
-             306:             String  "inPos"
-             318:             String  "pos"
-             324:             String  "instanceScale"
-             329:             String  "instancePos"
-             342:             String  "gl_Position"
-             345:             String  "gl_PointSize"
-             347:             String  "gl_CullDistance"
-             350:             String  "gl_PerVertex"
-             373:             String  "outNormal"
-             390:             String  "inNormal"
-             409:             String  "lPos"
-             430:             String  "outLightVec"
-             439:             String  "outViewVec"
+              61:             String  "int"
+              67:             String  "instanceTexIndex"
+              78:             String  "s"
+              85:             String  "instanceRot"
+              95:             String  "bool"
+             100:             String  "modelview"
+             104:             String  "lightPos"
+             107:             String  "globSpeed"
+             111:             String  "UBO"
+             116:             String  "ubo"
+             126:             String  "c"
+             142:             String  "mx"
+             186:             String  "my"
+             223:             String  "mz"
+             244:             String  "rotMat"
+             274:             String  "gRotMat"
+             301:             String  "locPos"
+             307:             String  "inPos"
+             317:             String  "pos"
+             325:             String  "instanceScale"
+             330:             String  "instancePos"
+             341:             String  "gl_Position"
+             344:             String  "gl_PointSize"
+             346:             String  "gl_CullDistance"
+             349:             String  "gl_PerVertex"
+             372:             String  "outNormal"
+             391:             String  "inNormal"
+             408:             String  "lPos"
+             429:             String  "outLightVec"
+             438:             String  "outViewVec"
                               Name 14  "main"
-                              Name 36  "outColor"
+                              Name 35  "outColor"
                               Name 42  "inColor"
-                              Name 48  "outUV"
+                              Name 47  "outUV"
                               Name 55  "inUV"
-                              Name 64  "instanceTexIndex"
-                              Name 77  "s"
-                              Name 82  "instanceRot"
-                              Name 97  "UBO"
-                              MemberName 97(UBO) 0  "projection"
-                              MemberName 97(UBO) 1  "modelview"
-                              MemberName 97(UBO) 2  "lightPos"
-                              MemberName 97(UBO) 3  "locSpeed"
-                              MemberName 97(UBO) 4  "globSpeed"
-                              Name 113  "ubo"
-                              Name 125  "c"
-                              Name 141  "mx"
-                              Name 185  "my"
-                              Name 222  "mz"
-                              Name 243  "rotMat"
-                              Name 273  "gRotMat"
-                              Name 300  "locPos"
-                              Name 304  "inPos"
-                              Name 316  "pos"
-                              Name 322  "instanceScale"
-                              Name 327  "instancePos"
-                              Name 340  "gl_PerVertex"
-                              MemberName 340(gl_PerVertex) 0  "gl_Position"
-                              MemberName 340(gl_PerVertex) 1  "gl_PointSize"
-                              MemberName 340(gl_PerVertex) 2  "gl_ClipDistance"
-                              MemberName 340(gl_PerVertex) 3  "gl_CullDistance"
+                              Name 65  "instanceTexIndex"
+                              Name 76  "s"
+                              Name 83  "instanceRot"
+                              Name 98  "UBO"
+                              MemberName 98(UBO) 0  "projection"
+                              MemberName 98(UBO) 1  "modelview"
+                              MemberName 98(UBO) 2  "lightPos"
+                              MemberName 98(UBO) 3  "locSpeed"
+                              MemberName 98(UBO) 4  "globSpeed"
+                              Name 114  "ubo"
+                              Name 124  "c"
+                              Name 140  "mx"
+                              Name 184  "my"
+                              Name 221  "mz"
+                              Name 242  "rotMat"
+                              Name 272  "gRotMat"
+                              Name 299  "locPos"
+                              Name 305  "inPos"
+                              Name 315  "pos"
+                              Name 323  "instanceScale"
+                              Name 328  "instancePos"
+                              Name 339  "gl_PerVertex"
+                              MemberName 339(gl_PerVertex) 0  "gl_Position"
+                              MemberName 339(gl_PerVertex) 1  "gl_PointSize"
+                              MemberName 339(gl_PerVertex) 2  "gl_ClipDistance"
+                              MemberName 339(gl_PerVertex) 3  "gl_CullDistance"
                               Name 353  ""
-                              Name 371  "outNormal"
-                              Name 388  "inNormal"
-                              Name 407  "lPos"
-                              Name 428  "outLightVec"
-                              Name 437  "outViewVec"
-                              Decorate 36(outColor) Location 1
+                              Name 370  "outNormal"
+                              Name 389  "inNormal"
+                              Name 406  "lPos"
+                              Name 427  "outLightVec"
+                              Name 436  "outViewVec"
+                              Decorate 35(outColor) Location 1
                               Decorate 42(inColor) Location 3
-                              Decorate 48(outUV) Location 2
+                              Decorate 47(outUV) Location 2
                               Decorate 55(inUV) Location 2
-                              Decorate 64(instanceTexIndex) Location 7
-                              Decorate 82(instanceRot) Location 5
-                              MemberDecorate 97(UBO) 0 ColMajor
-                              MemberDecorate 97(UBO) 0 Offset 0
-                              MemberDecorate 97(UBO) 0 MatrixStride 16
-                              MemberDecorate 97(UBO) 1 ColMajor
-                              MemberDecorate 97(UBO) 1 Offset 64
-                              MemberDecorate 97(UBO) 1 MatrixStride 16
-                              MemberDecorate 97(UBO) 2 Offset 128
-                              MemberDecorate 97(UBO) 3 Offset 144
-                              MemberDecorate 97(UBO) 4 Offset 148
-                              Decorate 97(UBO) Block
-                              Decorate 113(ubo) DescriptorSet 0
-                              Decorate 113(ubo) Binding 0
-                              Decorate 304(inPos) Location 0
-                              Decorate 322(instanceScale) Location 6
-                              Decorate 327(instancePos) Location 4
-                              MemberDecorate 340(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 340(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 340(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 340(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 340(gl_PerVertex) Block
-                              Decorate 371(outNormal) Location 0
-                              Decorate 388(inNormal) Location 1
-                              Decorate 428(outLightVec) Location 4
-                              Decorate 437(outViewVec) Location 3
+                              Decorate 65(instanceTexIndex) Location 7
+                              Decorate 83(instanceRot) Location 5
+                              MemberDecorate 98(UBO) 0 ColMajor
+                              MemberDecorate 98(UBO) 0 Offset 0
+                              MemberDecorate 98(UBO) 0 MatrixStride 16
+                              MemberDecorate 98(UBO) 1 ColMajor
+                              MemberDecorate 98(UBO) 1 Offset 64
+                              MemberDecorate 98(UBO) 1 MatrixStride 16
+                              MemberDecorate 98(UBO) 2 Offset 128
+                              MemberDecorate 98(UBO) 3 Offset 144
+                              MemberDecorate 98(UBO) 4 Offset 148
+                              Decorate 98(UBO) Block
+                              Decorate 114(ubo) DescriptorSet 0
+                              Decorate 114(ubo) Binding 0
+                              Decorate 305(inPos) Location 0
+                              Decorate 323(instanceScale) Location 6
+                              Decorate 328(instancePos) Location 4
+                              MemberDecorate 339(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 339(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 339(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 339(gl_PerVertex) 3 BuiltIn CullDistance
+                              Decorate 339(gl_PerVertex) Block
+                              Decorate 370(outNormal) Location 0
+                              Decorate 389(inNormal) Location 1
+                              Decorate 427(outLightVec) Location 4
+                              Decorate 436(outViewVec) Location 3
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 19
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               20:      7(int) Constant 54
               22:      7(int) Constant 1
               23:      7(int) Constant 4
               24:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
-              17:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
-              28:      7(int) Constant 56
-              29:             TypeFloat 32
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 30 10 13 12
-              32:             TypeVector 29(float) 3
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 13
-              34:             TypePointer Output 32(fvec3)
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 13 12
-    36(outColor):     34(ptr) Variable Output
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
+              17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
+              28:             TypeFloat 32
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 29 10 13 12
+              31:             TypeVector 28(float) 3
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 13
+              33:             TypePointer Output 31(fvec3)
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 13 12
+    35(outColor):     33(ptr) Variable Output
+              38:      7(int) Constant 56
               39:      7(int) Constant 8
-              37:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 38 33 18 28 12 21 38 36(outColor) 39
-              40:             TypePointer Input 32(fvec3)
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 22 12
+              36:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 37 32 18 38 12 21 37 35(outColor) 39
+              40:             TypePointer Input 31(fvec3)
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 22 12
      42(inColor):     40(ptr) Variable Input
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 44 33 18 28 12 21 44 42(inColor) 39
-              47:      7(int) Constant 57
-       48(outUV):     34(ptr) Variable Output
-              49:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 50 33 18 47 12 21 50 48(outUV) 39
-              51:             TypeVector 29(float) 2
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 24
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 44 32 18 38 12 21 44 42(inColor) 39
+       47(outUV):     33(ptr) Variable Output
+              50:      7(int) Constant 57
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 49 32 18 50 12 21 49 47(outUV) 39
+              51:             TypeVector 28(float) 2
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 24
               53:             TypePointer Input 51(fvec2)
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 52 22 12
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 52 22 12
         55(inUV):     53(ptr) Variable Input
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 57 52 18 47 12 21 57 55(inUV) 39
-              59:             TypeInt 32 1
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 60 10 23 12
-              62:             TypePointer Input 59(int)
-              63:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 22 12
-64(instanceTexIndex):     62(ptr) Variable Input
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 66 61 18 47 12 21 66 64(instanceTexIndex) 39
-              73:      7(int) Constant 62
-              74:             TypePointer Function 29(float)
-              75:      7(int) Constant 7
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 75 12
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 79 31 18 73 12 17 23
-              81:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
- 82(instanceRot):     40(ptr) Variable Input
-              83:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 84 33 18 73 12 21 84 82(instanceRot) 39
-              85:             TypePointer Input 29(float)
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 22 12
-              89:             TypeVector 29(float) 4
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 31 23
-              91:             TypeMatrix 89(fvec4) 4
-              93:             TypeBool
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 94 10 24 12
-              96:    93(bool) ConstantTrue
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 90 23 96
-         97(UBO):             TypeStruct 91 91 89(fvec4) 29(float) 29(float)
-             100:      7(int) Constant 42
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 99 92 18 100 75 12 12 13
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 99 92 18 100 75 12 12 13
-             104:      7(int) Constant 43
-             102:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 103 90 18 104 75 12 12 13
-             107:      7(int) Constant 45
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 106 31 18 107 39 12 12 13
-             108:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 106 31 18 107 39 12 12 13
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 110 22 18 73 12 21 110 12 13 98 101 102 105 108
-             111:             TypePointer Uniform 97(UBO)
-             112:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 109 24 12
-        113(ubo):    111(ptr) Variable Uniform
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 115 109 18 73 12 21 115 113(ubo) 39
-             116:     59(int) Constant 3
-             117:             TypePointer Uniform 29(float)
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 24 12
-             124:      7(int) Constant 63
-             126:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 127 31 18 124 12 17 23
-             136:      7(int) Constant 65
-             137:             TypeMatrix 32(fvec3) 3
-             138:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 33 13 96
-             139:             TypePointer Function 137
-             140:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 138 75 12
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 143 138 18 136 12 17 23
-             145:     59(int) Constant 0
-             148:   29(float) Constant 0
-             150:             TypePointer Function 32(fvec3)
-             151:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 33 75 12
-             154:      7(int) Constant 66
-             155:     59(int) Constant 1
-             162:      7(int) Constant 67
-             163:     59(int) Constant 2
-             164:   29(float) Constant 1065353216
-             165:   32(fvec3) ConstantComposite 148 148 164
-             168:      7(int) Constant 70
-             176:      7(int) Constant 71
-             184:      7(int) Constant 73
-             186:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 187 138 18 184 12 17 23
-             194:      7(int) Constant 74
-             195:   32(fvec3) ConstantComposite 148 164 148
-             198:      7(int) Constant 75
-             205:      7(int) Constant 78
-             213:      7(int) Constant 79
-             221:      7(int) Constant 81
-             223:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 224 138 18 221 12 17 23
-             226:   32(fvec3) ConstantComposite 164 148 148
-             229:      7(int) Constant 82
-             235:      7(int) Constant 83
-             242:      7(int) Constant 85
-             244:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 245 138 18 242 12 17 23
-             253:      7(int) Constant 88
-             256:     59(int) Constant 4
-             262:      7(int) Constant 89
-             270:      7(int) Constant 90
-             271:             TypePointer Function 91
-             272:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 92 75 12
-             274:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 275 92 18 270 12 17 23
-             280:             TypePointer Function 89(fvec4)
-             281:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 90 75 12
-             284:      7(int) Constant 91
-             285:   89(fvec4) ConstantComposite 148 164 148 148
-             288:      7(int) Constant 92
-             295:      7(int) Constant 93
-             296:   89(fvec4) ConstantComposite 148 148 148 164
-             299:      7(int) Constant 95
-             301:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 302 90 18 299 12 17 23
-      304(inPos):     40(ptr) Variable Input
-             305:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 306 33 18 299 12 21 306 304(inPos) 39
-             315:      7(int) Constant 96
-             317:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 318 90 18 315 12 17 23
-322(instanceScale):     85(ptr) Variable Input
-             323:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 324 31 18 315 12 21 324 322(instanceScale) 39
-327(instancePos):     40(ptr) Variable Input
-             328:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 329 33 18 315 12 21 329 327(instancePos) 39
-             337:      7(int) Constant 98
-             338:             TypeArray 29(float) 22
-             339:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 31 22
-340(gl_PerVertex):             TypeStruct 89(fvec4) 29(float) 338 338
-             343:      7(int) Constant 24
-             341:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 342 90 18 22 343 12 12 13
-             344:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 345 31 18 22 100 12 12 13
-             346:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 347 339 18 22 242 12 12 13
-             348:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 347 339 18 22 242 12 12 13
-             349:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 350 22 18 337 12 21 350 12 13 341 344 346 348
-             351:             TypePointer Output 340(gl_PerVertex)
-             352:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 349 13 12
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 57 52 18 50 12 21 57 55(inUV) 39
+              60:             TypeInt 32 1
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 61 10 23 12
+              63:             TypePointer Input 60(int)
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 62 22 12
+65(instanceTexIndex):     63(ptr) Variable Input
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 67 62 18 50 12 21 67 65(instanceTexIndex) 39
+              73:             TypePointer Function 28(float)
+              74:      7(int) Constant 7
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 74 12
+              79:      7(int) Constant 62
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 78 30 18 79 12 17 23
+              81:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+ 83(instanceRot):     40(ptr) Variable Input
+              84:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 85 32 18 79 12 21 85 83(instanceRot) 39
+              86:             TypePointer Input 28(float)
+              87:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 22 12
+              90:             TypeVector 28(float) 4
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 30 23
+              92:             TypeMatrix 90(fvec4) 4
+              94:             TypeBool
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 95 10 24 12
+              97:    94(bool) ConstantTrue
+              93:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 91 23 97
+         98(UBO):             TypeStruct 92 92 90(fvec4) 28(float) 28(float)
+             101:      7(int) Constant 42
+              99:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 100 93 18 101 74 12 12 13
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 100 93 18 101 74 12 12 13
+             105:      7(int) Constant 43
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 104 91 18 105 74 12 12 13
+             108:      7(int) Constant 45
+             106:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 107 30 18 108 39 12 12 13
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 107 30 18 108 39 12 12 13
+             110:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 111 22 18 79 12 21 111 12 13 99 102 103 106 109
+             112:             TypePointer Uniform 98(UBO)
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 110 24 12
+        114(ubo):    112(ptr) Variable Uniform
+             115:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 116 110 18 79 12 21 116 114(ubo) 39
+             117:     60(int) Constant 3
+             118:             TypePointer Uniform 28(float)
+             119:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 24 12
+             127:      7(int) Constant 63
+             125:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 126 30 18 127 12 17 23
+             136:             TypeMatrix 31(fvec3) 3
+             137:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 32 13 97
+             138:             TypePointer Function 136
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 137 74 12
+             143:      7(int) Constant 65
+             141:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 142 137 18 143 12 17 23
+             146:     60(int) Constant 0
+             149:   28(float) Constant 0
+             151:             TypePointer Function 31(fvec3)
+             152:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 32 74 12
+             154:     60(int) Constant 1
+             157:      7(int) Constant 66
+             162:     60(int) Constant 2
+             163:   28(float) Constant 1065353216
+             164:   31(fvec3) ConstantComposite 149 149 163
+             167:      7(int) Constant 67
+             170:      7(int) Constant 70
+             178:      7(int) Constant 71
+             187:      7(int) Constant 73
+             185:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 186 137 18 187 12 17 23
+             194:   31(fvec3) ConstantComposite 149 163 149
+             197:      7(int) Constant 74
+             200:      7(int) Constant 75
+             207:      7(int) Constant 78
+             215:      7(int) Constant 79
+             224:      7(int) Constant 81
+             222:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 223 137 18 224 12 17 23
+             227:   31(fvec3) ConstantComposite 163 149 149
+             231:      7(int) Constant 82
+             237:      7(int) Constant 83
+             245:      7(int) Constant 85
+             243:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 244 137 18 245 12 17 23
+             255:      7(int) Constant 88
+             257:     60(int) Constant 4
+             264:      7(int) Constant 89
+             270:             TypePointer Function 92
+             271:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 93 74 12
+             275:      7(int) Constant 90
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 274 93 18 275 12 17 23
+             281:             TypePointer Function 90(fvec4)
+             282:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 91 74 12
+             284:   90(fvec4) ConstantComposite 149 163 149 149
+             287:      7(int) Constant 91
+             290:      7(int) Constant 92
+             295:   90(fvec4) ConstantComposite 149 149 149 163
+             298:      7(int) Constant 93
+             302:      7(int) Constant 95
+             300:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 301 91 18 302 12 17 23
+      305(inPos):     40(ptr) Variable Input
+             306:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 307 32 18 302 12 21 307 305(inPos) 39
+             318:      7(int) Constant 96
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 317 91 18 318 12 17 23
+323(instanceScale):     86(ptr) Variable Input
+             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 325 30 18 318 12 21 325 323(instanceScale) 39
+328(instancePos):     40(ptr) Variable Input
+             329:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 330 32 18 318 12 21 330 328(instancePos) 39
+             337:             TypeArray 28(float) 22
+             338:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 30 22
+339(gl_PerVertex):             TypeStruct 90(fvec4) 28(float) 337 337
+             342:      7(int) Constant 24
+             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 341 91 18 22 342 12 12 13
+             343:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 344 30 18 22 101 12 12 13
+             345:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 346 338 18 22 245 12 12 13
+             347:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 346 338 18 22 245 12 12 13
+             350:      7(int) Constant 98
+             348:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 349 22 18 350 12 21 349 12 13 340 343 345 347
+             351:             TypePointer Output 339(gl_PerVertex)
+             352:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 348 13 12
              353:    351(ptr) Variable Output
-             354:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 349 18 337 12 21 1 353 39
-             355:             TypePointer Uniform 91
-             356:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 92 24 12
-             366:             TypePointer Output 89(fvec4)
-             367:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 90 13 12
-             370:      7(int) Constant 99
-  371(outNormal):     34(ptr) Variable Output
-             372:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 373 33 18 370 12 21 373 371(outNormal) 39
-   388(inNormal):     40(ptr) Variable Input
-             389:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 390 33 18 370 12 21 390 388(inNormal) 39
-             394:      7(int) Constant 101
-             406:      7(int) Constant 102
-             408:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 409 33 18 406 12 17 23
-             420:             TypePointer Uniform 89(fvec4)
-             421:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 90 24 12
-             427:      7(int) Constant 103
-428(outLightVec):     34(ptr) Variable Output
-             429:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 430 33 18 427 12 21 430 428(outLightVec) 39
-             436:      7(int) Constant 104
- 437(outViewVec):     34(ptr) Variable Output
-             438:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 439 33 18 436 12 21 439 437(outViewVec) 39
-                              Line 1 54 11
+             354:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 348 18 350 12 21 2 353 39
+             355:             TypePointer Uniform 92
+             356:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 93 24 12
+             367:             TypePointer Output 90(fvec4)
+             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 91 13 12
+  370(outNormal):     33(ptr) Variable Output
+             373:      7(int) Constant 99
+             371:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 372 32 18 373 12 21 372 370(outNormal) 39
+   389(inNormal):     40(ptr) Variable Input
+             390:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 391 32 18 373 12 21 391 389(inNormal) 39
+             396:      7(int) Constant 101
+             409:      7(int) Constant 102
+             407:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 408 32 18 409 12 17 23
+             421:             TypePointer Uniform 90(fvec4)
+             422:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 91 24 12
+427(outLightVec):     33(ptr) Variable Output
+             430:      7(int) Constant 103
+             428:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 429 32 18 430 12 21 429 427(outLightVec) 39
+ 436(outViewVec):     33(ptr) Variable Output
+             439:      7(int) Constant 104
+             437:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 438 32 18 439 12 21 438 436(outViewVec) 39
         14(main):           4 Function None 5
               15:             Label
-           77(s):     74(ptr) Variable Function
-          125(c):     74(ptr) Variable Function
-         141(mx):    139(ptr) Variable Function
-         185(my):    139(ptr) Variable Function
-         222(mz):    139(ptr) Variable Function
-     243(rotMat):    139(ptr) Variable Function
-    273(gRotMat):    271(ptr) Variable Function
-     300(locPos):    280(ptr) Variable Function
-        316(pos):    280(ptr) Variable Function
-       407(lPos):    150(ptr) Variable Function
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-              45:   32(fvec3) Load 42(inColor)
-                              Store 36(outColor) 45
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 47 47 12 12
+           76(s):     73(ptr) Variable Function
+          124(c):     73(ptr) Variable Function
+         140(mx):    138(ptr) Variable Function
+         184(my):    138(ptr) Variable Function
+         221(mz):    138(ptr) Variable Function
+     242(rotMat):    138(ptr) Variable Function
+    272(gRotMat):    270(ptr) Variable Function
+     299(locPos):    281(ptr) Variable Function
+        315(pos):    281(ptr) Variable Function
+       406(lPos):    151(ptr) Variable Function
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 38 38 12 12
+              45:   31(fvec3) Load 42(inColor)
+                              Store 35(outColor) 45
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 50 50 12 12
               58:   51(fvec2) Load 55(inUV)
-              67:     59(int) Load 64(instanceTexIndex)
-              68:   29(float) ConvertSToF 67
-              69:   29(float) CompositeExtract 58 0
-              70:   29(float) CompositeExtract 58 1
-              71:   32(fvec3) CompositeConstruct 69 70 68
-                              Store 48(outUV) 71
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 73 73 12 12
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 78 77(s) 81
-              87:     85(ptr) AccessChain 82(instanceRot) 12
-              88:   29(float) Load 87
-             119:    117(ptr) AccessChain 113(ubo) 116
-             120:   29(float) Load 119
-             121:   29(float) FAdd 88 120
-             122:   29(float) ExtInst 3(GLSL.std.450) 13(Sin) 121
-                              Store 77(s) 122
-             123:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 124 124 12 12
-             128:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 126 125(c) 81
-             129:     85(ptr) AccessChain 82(instanceRot) 12
-             130:   29(float) Load 129
-             131:    117(ptr) AccessChain 113(ubo) 116
-             132:   29(float) Load 131
-             133:   29(float) FAdd 130 132
-             134:   29(float) ExtInst 3(GLSL.std.450) 14(Cos) 133
-                              Store 125(c) 134
-             135:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 136 136 12 12
-             144:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 142 141(mx) 81
-             146:   29(float) Load 125(c)
-             147:   29(float) Load 77(s)
-             149:   32(fvec3) CompositeConstruct 146 147 148
-             152:    150(ptr) AccessChain 141(mx) 145
-                              Store 152 149
-             153:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 154 154 12 12
-             156:   29(float) Load 77(s)
-             157:   29(float) FNegate 156
-             158:   29(float) Load 125(c)
-             159:   32(fvec3) CompositeConstruct 157 158 148
-             160:    150(ptr) AccessChain 141(mx) 155
-                              Store 160 159
-             161:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 162 162 12 12
-             166:    150(ptr) AccessChain 141(mx) 163
-                              Store 166 165
-             167:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 168 168 12 12
-             169:     85(ptr) AccessChain 82(instanceRot) 22
-             170:   29(float) Load 169
-             171:    117(ptr) AccessChain 113(ubo) 116
-             172:   29(float) Load 171
-             173:   29(float) FAdd 170 172
-             174:   29(float) ExtInst 3(GLSL.std.450) 13(Sin) 173
-                              Store 77(s) 174
-             175:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 176 176 12 12
-             177:     85(ptr) AccessChain 82(instanceRot) 22
-             178:   29(float) Load 177
-             179:    117(ptr) AccessChain 113(ubo) 116
-             180:   29(float) Load 179
-             181:   29(float) FAdd 178 180
-             182:   29(float) ExtInst 3(GLSL.std.450) 14(Cos) 181
-                              Store 125(c) 182
-             183:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 184 184 12 12
-             188:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 186 185(my) 81
-             189:   29(float) Load 125(c)
-             190:   29(float) Load 77(s)
-             191:   32(fvec3) CompositeConstruct 189 148 190
-             192:    150(ptr) AccessChain 185(my) 145
-                              Store 192 191
-             193:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 194 194 12 12
-             196:    150(ptr) AccessChain 185(my) 155
-                              Store 196 195
-             197:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 198 198 12 12
-             199:   29(float) Load 77(s)
-             200:   29(float) FNegate 199
-             201:   29(float) Load 125(c)
-             202:   32(fvec3) CompositeConstruct 200 148 201
-             203:    150(ptr) AccessChain 185(my) 163
-                              Store 203 202
-             204:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 205 205 12 12
-             206:     85(ptr) AccessChain 82(instanceRot) 24
-             207:   29(float) Load 206
-             208:    117(ptr) AccessChain 113(ubo) 116
-             209:   29(float) Load 208
-             210:   29(float) FAdd 207 209
-             211:   29(float) ExtInst 3(GLSL.std.450) 13(Sin) 210
-                              Store 77(s) 211
-             212:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 213 213 12 12
-             214:     85(ptr) AccessChain 82(instanceRot) 24
-             215:   29(float) Load 214
-             216:    117(ptr) AccessChain 113(ubo) 116
-             217:   29(float) Load 216
-             218:   29(float) FAdd 215 217
-             219:   29(float) ExtInst 3(GLSL.std.450) 14(Cos) 218
-                              Store 125(c) 219
-             220:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 221 221 12 12
-             225:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 223 222(mz) 81
-             227:    150(ptr) AccessChain 222(mz) 145
-                              Store 227 226
-             228:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 229 229 12 12
-             230:   29(float) Load 125(c)
-             231:   29(float) Load 77(s)
-             232:   32(fvec3) CompositeConstruct 148 230 231
-             233:    150(ptr) AccessChain 222(mz) 155
-                              Store 233 232
-             234:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 235 235 12 12
-             236:   29(float) Load 77(s)
-             237:   29(float) FNegate 236
-             238:   29(float) Load 125(c)
-             239:   32(fvec3) CompositeConstruct 148 237 238
-             240:    150(ptr) AccessChain 222(mz) 163
-                              Store 240 239
-             241:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 242 242 12 12
-             246:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 244 243(rotMat) 81
-             247:         137 Load 222(mz)
-             248:         137 Load 185(my)
-             249:         137 MatrixTimesMatrix 247 248
-             250:         137 Load 141(mx)
-             251:         137 MatrixTimesMatrix 249 250
-                              Store 243(rotMat) 251
-             252:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 253 253 12 12
-             254:     85(ptr) AccessChain 82(instanceRot) 22
-             255:   29(float) Load 254
-             257:    117(ptr) AccessChain 113(ubo) 256
-             258:   29(float) Load 257
-             259:   29(float) FAdd 255 258
-             260:   29(float) ExtInst 3(GLSL.std.450) 13(Sin) 259
-                              Store 77(s) 260
-             261:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 262 262 12 12
-             263:     85(ptr) AccessChain 82(instanceRot) 22
-             264:   29(float) Load 263
-             265:    117(ptr) AccessChain 113(ubo) 256
-             266:   29(float) Load 265
-             267:   29(float) FAdd 264 266
-             268:   29(float) ExtInst 3(GLSL.std.450) 14(Cos) 267
-                              Store 125(c) 268
-             269:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 270 270 12 12
-             276:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 274 273(gRotMat) 81
-             277:   29(float) Load 125(c)
-             278:   29(float) Load 77(s)
-             279:   89(fvec4) CompositeConstruct 277 148 278 148
-             282:    280(ptr) AccessChain 273(gRotMat) 145
-                              Store 282 279
-             283:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 284 284 12 12
-             286:    280(ptr) AccessChain 273(gRotMat) 155
-                              Store 286 285
-             287:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 288 288 12 12
-             289:   29(float) Load 77(s)
-             290:   29(float) FNegate 289
-             291:   29(float) Load 125(c)
-             292:   89(fvec4) CompositeConstruct 290 148 291 148
-             293:    280(ptr) AccessChain 273(gRotMat) 163
-                              Store 293 292
-             294:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 295 295 12 12
-             297:    280(ptr) AccessChain 273(gRotMat) 116
-                              Store 297 296
-             298:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 299 299 12 12
-             303:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 301 300(locPos) 81
-             307:   32(fvec3) Load 304(inPos)
-             308:         137 Load 243(rotMat)
-             309:   32(fvec3) VectorTimesMatrix 307 308
-             310:   29(float) CompositeExtract 309 0
-             311:   29(float) CompositeExtract 309 1
-             312:   29(float) CompositeExtract 309 2
-             313:   89(fvec4) CompositeConstruct 310 311 312 164
-                              Store 300(locPos) 313
-             314:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 315 315 12 12
-             319:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 317 316(pos) 81
-             320:   89(fvec4) Load 300(locPos)
-             321:   32(fvec3) VectorShuffle 320 320 0 1 2
-             325:   29(float) Load 322(instanceScale)
-             326:   32(fvec3) VectorTimesScalar 321 325
-             330:   32(fvec3) Load 327(instancePos)
-             331:   32(fvec3) FAdd 326 330
-             332:   29(float) CompositeExtract 331 0
-             333:   29(float) CompositeExtract 331 1
-             334:   29(float) CompositeExtract 331 2
-             335:   89(fvec4) CompositeConstruct 332 333 334 164
-                              Store 316(pos) 335
-             336:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 337 337 12 12
-             357:    355(ptr) AccessChain 113(ubo) 145
-             358:          91 Load 357
-             359:    355(ptr) AccessChain 113(ubo) 155
-             360:          91 Load 359
-             361:          91 MatrixTimesMatrix 358 360
-             362:          91 Load 273(gRotMat)
-             363:          91 MatrixTimesMatrix 361 362
-             364:   89(fvec4) Load 316(pos)
-             365:   89(fvec4) MatrixTimesVector 363 364
-             368:    366(ptr) AccessChain 353 145
-                              Store 368 365
-             369:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 370 370 12 12
-             374:    355(ptr) AccessChain 113(ubo) 155
-             375:          91 Load 374
-             376:          91 Load 273(gRotMat)
-             377:          91 MatrixTimesMatrix 375 376
-             378:   89(fvec4) CompositeExtract 377 0
-             379:   32(fvec3) VectorShuffle 378 378 0 1 2
-             380:   89(fvec4) CompositeExtract 377 1
-             381:   32(fvec3) VectorShuffle 380 380 0 1 2
-             382:   89(fvec4) CompositeExtract 377 2
-             383:   32(fvec3) VectorShuffle 382 382 0 1 2
-             384:         137 CompositeConstruct 379 381 383
-             385:         137 Load 243(rotMat)
-             386:         137 ExtInst 3(GLSL.std.450) 34(MatrixInverse) 385
-             387:         137 MatrixTimesMatrix 384 386
-             391:   32(fvec3) Load 388(inNormal)
-             392:   32(fvec3) MatrixTimesVector 387 391
-                              Store 371(outNormal) 392
-             393:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 394 394 12 12
-             395:    355(ptr) AccessChain 113(ubo) 155
-             396:          91 Load 395
-             397:   32(fvec3) Load 304(inPos)
-             398:   32(fvec3) Load 327(instancePos)
-             399:   32(fvec3) FAdd 397 398
-             400:   29(float) CompositeExtract 399 0
-             401:   29(float) CompositeExtract 399 1
-             402:   29(float) CompositeExtract 399 2
-             403:   89(fvec4) CompositeConstruct 400 401 402 164
-             404:   89(fvec4) MatrixTimesVector 396 403
-                              Store 316(pos) 404
-             405:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 406 406 12 12
-             410:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 408 407(lPos) 81
-             411:    355(ptr) AccessChain 113(ubo) 155
-             412:          91 Load 411
-             413:   89(fvec4) CompositeExtract 412 0
-             414:   32(fvec3) VectorShuffle 413 413 0 1 2
-             415:   89(fvec4) CompositeExtract 412 1
-             416:   32(fvec3) VectorShuffle 415 415 0 1 2
-             417:   89(fvec4) CompositeExtract 412 2
-             418:   32(fvec3) VectorShuffle 417 417 0 1 2
-             419:         137 CompositeConstruct 414 416 418
-             422:    420(ptr) AccessChain 113(ubo) 163
-             423:   89(fvec4) Load 422
-             424:   32(fvec3) VectorShuffle 423 423 0 1 2
-             425:   32(fvec3) MatrixTimesVector 419 424
-                              Store 407(lPos) 425
-             426:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 427 427 12 12
-             431:   32(fvec3) Load 407(lPos)
-             432:   89(fvec4) Load 316(pos)
-             433:   32(fvec3) VectorShuffle 432 432 0 1 2
-             434:   32(fvec3) FSub 431 433
-                              Store 428(outLightVec) 434
-             435:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 436 436 12 12
-             440:   89(fvec4) Load 316(pos)
-             441:   32(fvec3) VectorShuffle 440 440 0 1 2
-             442:   32(fvec3) FNegate 441
-                              Store 437(outViewVec) 442
+              68:     60(int) Load 65(instanceTexIndex)
+              69:   28(float) ConvertSToF 68
+              70:   28(float) CompositeExtract 58 0
+              71:   28(float) CompositeExtract 58 1
+              72:   31(fvec3) CompositeConstruct 70 71 69
+                              Store 47(outUV) 72
+              82:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 79 79 12 12
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 77 76(s) 81
+              88:     86(ptr) AccessChain 83(instanceRot) 12
+              89:   28(float) Load 88
+             120:    118(ptr) AccessChain 114(ubo) 117
+             121:   28(float) Load 120
+             122:   28(float) FAdd 89 121
+             123:   28(float) ExtInst 3(GLSL.std.450) 13(Sin) 122
+                              Store 76(s) 123
+             129:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 127 127 12 12
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 125 124(c) 81
+             130:     86(ptr) AccessChain 83(instanceRot) 12
+             131:   28(float) Load 130
+             132:    118(ptr) AccessChain 114(ubo) 117
+             133:   28(float) Load 132
+             134:   28(float) FAdd 131 133
+             135:   28(float) ExtInst 3(GLSL.std.450) 14(Cos) 134
+                              Store 124(c) 135
+             145:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 143 143 12 12
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 141 140(mx) 81
+             147:   28(float) Load 124(c)
+             148:   28(float) Load 76(s)
+             150:   31(fvec3) CompositeConstruct 147 148 149
+             153:    151(ptr) AccessChain 140(mx) 146
+                              Store 153 150
+             156:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 157 157 12 12
+             155:   28(float) Load 76(s)
+             158:   28(float) FNegate 155
+             159:   28(float) Load 124(c)
+             160:   31(fvec3) CompositeConstruct 158 159 149
+             161:    151(ptr) AccessChain 140(mx) 154
+                              Store 161 160
+             166:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 167 167 12 12
+             165:    151(ptr) AccessChain 140(mx) 162
+                              Store 165 164
+             169:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 170 170 12 12
+             168:     86(ptr) AccessChain 83(instanceRot) 22
+             171:   28(float) Load 168
+             172:    118(ptr) AccessChain 114(ubo) 117
+             173:   28(float) Load 172
+             174:   28(float) FAdd 171 173
+             175:   28(float) ExtInst 3(GLSL.std.450) 13(Sin) 174
+                              Store 76(s) 175
+             177:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 178 178 12 12
+             176:     86(ptr) AccessChain 83(instanceRot) 22
+             179:   28(float) Load 176
+             180:    118(ptr) AccessChain 114(ubo) 117
+             181:   28(float) Load 180
+             182:   28(float) FAdd 179 181
+             183:   28(float) ExtInst 3(GLSL.std.450) 14(Cos) 182
+                              Store 124(c) 183
+             189:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 187 187 12 12
+             188:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 185 184(my) 81
+             190:   28(float) Load 124(c)
+             191:   28(float) Load 76(s)
+             192:   31(fvec3) CompositeConstruct 190 149 191
+             193:    151(ptr) AccessChain 184(my) 146
+                              Store 193 192
+             196:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 197 197 12 12
+             195:    151(ptr) AccessChain 184(my) 154
+                              Store 195 194
+             199:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 200 200 12 12
+             198:   28(float) Load 76(s)
+             201:   28(float) FNegate 198
+             202:   28(float) Load 124(c)
+             203:   31(fvec3) CompositeConstruct 201 149 202
+             204:    151(ptr) AccessChain 184(my) 162
+                              Store 204 203
+             206:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 207 207 12 12
+             205:     86(ptr) AccessChain 83(instanceRot) 24
+             208:   28(float) Load 205
+             209:    118(ptr) AccessChain 114(ubo) 117
+             210:   28(float) Load 209
+             211:   28(float) FAdd 208 210
+             212:   28(float) ExtInst 3(GLSL.std.450) 13(Sin) 211
+                              Store 76(s) 212
+             214:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 215 215 12 12
+             213:     86(ptr) AccessChain 83(instanceRot) 24
+             216:   28(float) Load 213
+             217:    118(ptr) AccessChain 114(ubo) 117
+             218:   28(float) Load 217
+             219:   28(float) FAdd 216 218
+             220:   28(float) ExtInst 3(GLSL.std.450) 14(Cos) 219
+                              Store 124(c) 220
+             226:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 224 224 12 12
+             225:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 222 221(mz) 81
+             228:    151(ptr) AccessChain 221(mz) 146
+                              Store 228 227
+             230:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 231 231 12 12
+             229:   28(float) Load 124(c)
+             232:   28(float) Load 76(s)
+             233:   31(fvec3) CompositeConstruct 149 229 232
+             234:    151(ptr) AccessChain 221(mz) 154
+                              Store 234 233
+             236:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 237 237 12 12
+             235:   28(float) Load 76(s)
+             238:   28(float) FNegate 235
+             239:   28(float) Load 124(c)
+             240:   31(fvec3) CompositeConstruct 149 238 239
+             241:    151(ptr) AccessChain 221(mz) 162
+                              Store 241 240
+             247:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 245 245 12 12
+             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 243 242(rotMat) 81
+             248:         136 Load 221(mz)
+             249:         136 Load 184(my)
+             250:         136 MatrixTimesMatrix 248 249
+             251:         136 Load 140(mx)
+             252:         136 MatrixTimesMatrix 250 251
+                              Store 242(rotMat) 252
+             254:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 255 255 12 12
+             253:     86(ptr) AccessChain 83(instanceRot) 22
+             256:   28(float) Load 253
+             258:    118(ptr) AccessChain 114(ubo) 257
+             259:   28(float) Load 258
+             260:   28(float) FAdd 256 259
+             261:   28(float) ExtInst 3(GLSL.std.450) 13(Sin) 260
+                              Store 76(s) 261
+             263:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 264 264 12 12
+             262:     86(ptr) AccessChain 83(instanceRot) 22
+             265:   28(float) Load 262
+             266:    118(ptr) AccessChain 114(ubo) 257
+             267:   28(float) Load 266
+             268:   28(float) FAdd 265 267
+             269:   28(float) ExtInst 3(GLSL.std.450) 14(Cos) 268
+                              Store 124(c) 269
+             277:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 275 275 12 12
+             276:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 273 272(gRotMat) 81
+             278:   28(float) Load 124(c)
+             279:   28(float) Load 76(s)
+             280:   90(fvec4) CompositeConstruct 278 149 279 149
+             283:    281(ptr) AccessChain 272(gRotMat) 146
+                              Store 283 280
+             286:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 287 287 12 12
+             285:    281(ptr) AccessChain 272(gRotMat) 154
+                              Store 285 284
+             289:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 290 290 12 12
+             288:   28(float) Load 76(s)
+             291:   28(float) FNegate 288
+             292:   28(float) Load 124(c)
+             293:   90(fvec4) CompositeConstruct 291 149 292 149
+             294:    281(ptr) AccessChain 272(gRotMat) 162
+                              Store 294 293
+             297:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 298 298 12 12
+             296:    281(ptr) AccessChain 272(gRotMat) 117
+                              Store 296 295
+             304:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 302 302 12 12
+             303:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 300 299(locPos) 81
+             308:   31(fvec3) Load 305(inPos)
+             309:         136 Load 242(rotMat)
+             310:   31(fvec3) VectorTimesMatrix 308 309
+             311:   28(float) CompositeExtract 310 0
+             312:   28(float) CompositeExtract 310 1
+             313:   28(float) CompositeExtract 310 2
+             314:   90(fvec4) CompositeConstruct 311 312 313 163
+                              Store 299(locPos) 314
+             320:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 318 318 12 12
+             319:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 316 315(pos) 81
+             321:   90(fvec4) Load 299(locPos)
+             322:   31(fvec3) VectorShuffle 321 321 0 1 2
+             326:   28(float) Load 323(instanceScale)
+             327:   31(fvec3) VectorTimesScalar 322 326
+             331:   31(fvec3) Load 328(instancePos)
+             332:   31(fvec3) FAdd 327 331
+             333:   28(float) CompositeExtract 332 0
+             334:   28(float) CompositeExtract 332 1
+             335:   28(float) CompositeExtract 332 2
+             336:   90(fvec4) CompositeConstruct 333 334 335 163
+                              Store 315(pos) 336
+             358:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 350 350 12 12
+             357:    355(ptr) AccessChain 114(ubo) 146
+             359:          92 Load 357
+             360:    355(ptr) AccessChain 114(ubo) 154
+             361:          92 Load 360
+             362:          92 MatrixTimesMatrix 359 361
+             363:          92 Load 272(gRotMat)
+             364:          92 MatrixTimesMatrix 362 363
+             365:   90(fvec4) Load 315(pos)
+             366:   90(fvec4) MatrixTimesVector 364 365
+             369:    367(ptr) AccessChain 353 146
+                              Store 369 366
+             375:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 373 373 12 12
+             374:    355(ptr) AccessChain 114(ubo) 154
+             376:          92 Load 374
+             377:          92 Load 272(gRotMat)
+             378:          92 MatrixTimesMatrix 376 377
+             379:   90(fvec4) CompositeExtract 378 0
+             380:   31(fvec3) VectorShuffle 379 379 0 1 2
+             381:   90(fvec4) CompositeExtract 378 1
+             382:   31(fvec3) VectorShuffle 381 381 0 1 2
+             383:   90(fvec4) CompositeExtract 378 2
+             384:   31(fvec3) VectorShuffle 383 383 0 1 2
+             385:         136 CompositeConstruct 380 382 384
+             386:         136 Load 242(rotMat)
+             387:         136 ExtInst 3(GLSL.std.450) 34(MatrixInverse) 386
+             388:         136 MatrixTimesMatrix 385 387
+             392:   31(fvec3) Load 389(inNormal)
+             393:   31(fvec3) MatrixTimesVector 388 392
+                              Store 370(outNormal) 393
+             395:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 396 396 12 12
+             394:    355(ptr) AccessChain 114(ubo) 154
+             397:          92 Load 394
+             398:   31(fvec3) Load 305(inPos)
+             399:   31(fvec3) Load 328(instancePos)
+             400:   31(fvec3) FAdd 398 399
+             401:   28(float) CompositeExtract 400 0
+             402:   28(float) CompositeExtract 400 1
+             403:   28(float) CompositeExtract 400 2
+             404:   90(fvec4) CompositeConstruct 401 402 403 163
+             405:   90(fvec4) MatrixTimesVector 397 404
+                              Store 315(pos) 405
+             411:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 409 409 12 12
+             410:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 407 406(lPos) 81
+             412:    355(ptr) AccessChain 114(ubo) 154
+             413:          92 Load 412
+             414:   90(fvec4) CompositeExtract 413 0
+             415:   31(fvec3) VectorShuffle 414 414 0 1 2
+             416:   90(fvec4) CompositeExtract 413 1
+             417:   31(fvec3) VectorShuffle 416 416 0 1 2
+             418:   90(fvec4) CompositeExtract 413 2
+             419:   31(fvec3) VectorShuffle 418 418 0 1 2
+             420:         136 CompositeConstruct 415 417 419
+             423:    421(ptr) AccessChain 114(ubo) 162
+             424:   90(fvec4) Load 423
+             425:   31(fvec3) VectorShuffle 424 424 0 1 2
+             426:   31(fvec3) MatrixTimesVector 420 425
+                              Store 406(lPos) 426
+             432:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 430 430 12 12
+             431:   31(fvec3) Load 406(lPos)
+             433:   90(fvec4) Load 315(pos)
+             434:   31(fvec3) VectorShuffle 433 433 0 1 2
+             435:   31(fvec3) FSub 431 434
+                              Store 427(outLightVec) 435
+             441:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 439 439 12 12
+             440:   90(fvec4) Load 315(pos)
+             442:   31(fvec3) VectorShuffle 440 440 0 1 2
+             443:   31(fvec3) FNegate 442
+                              Store 436(outViewVec) 443
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.comp.out b/Test/baseResults/spv.debuginfo.hlsl.comp.out
index b4dd8371..e231ed3e 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.comp.out
@@ -1,16 +1,16 @@
 spv.debuginfo.hlsl.comp
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 966
+// Id's are bound by 970
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint GLCompute 6  "main" 961
+                              EntryPoint GLCompute 6  "main" 965
                               ExecutionMode 6 LocalSize 10 10 1
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               32:             String  "springForce"
@@ -23,39 +23,39 @@ spv.debuginfo.hlsl.comp
 // OpModuleProcessed hlsl-offsets
 #line 1
 "
-              44:             String  "p0"
+              42:             String  "p0"
               48:             String  "p1"
               52:             String  "restDist"
               63:             String  "@main"
-              69:             String  "id"
-              77:             String  "dist"
-              89:             String  "int"
-              95:             String  "sphereRadius"
-             106:             String  "gravity"
-             111:             String  "particleCount"
-             114:             String  "UBO"
-             117:             String  "params"
-             121:             String  "ubo"
-             149:             String  "index"
-             173:             String  "bool"
-             187:             String  "normal"
-             194:             String  "pinned"
-             198:             String  "Particle"
-             203:             String  "@data"
-             207:             String  "particleIn"
-             229:             String  "particleOut"
-             256:             String  "force"
-             269:             String  "pos"
-             279:             String  "vel"
-             563:             String  "f"
-             612:             String  "sphereDist"
-             664:             String  "calculateNormals"
-             668:             String  "PushConstants"
-             671:             String  "pushConstants"
-             674:             String  "$Global"
-             713:             String  "a"
-             726:             String  "b"
-             743:             String  "c"
+              67:             String  "id"
+              73:             String  "dist"
+              87:             String  "int"
+              93:             String  "sphereRadius"
+             104:             String  "gravity"
+             109:             String  "particleCount"
+             112:             String  "UBO"
+             115:             String  "params"
+             119:             String  "ubo"
+             146:             String  "index"
+             172:             String  "bool"
+             184:             String  "normal"
+             191:             String  "pinned"
+             195:             String  "Particle"
+             201:             String  "@data"
+             205:             String  "particleIn"
+             226:             String  "particleOut"
+             254:             String  "force"
+             268:             String  "pos"
+             278:             String  "vel"
+             562:             String  "f"
+             611:             String  "sphereDist"
+             662:             String  "calculateNormals"
+             666:             String  "PushConstants"
+             670:             String  "pushConstants"
+             673:             String  "$Global"
+             711:             String  "a"
+             725:             String  "b"
+             742:             String  "c"
                               Name 6  "main"
                               Name 30  "springForce(vf3;vf3;f1;"
                               Name 27  "p0"
@@ -63,113 +63,113 @@ spv.debuginfo.hlsl.comp
                               Name 29  "restDist"
                               Name 61  "@main(vu3;"
                               Name 60  "id"
-                              Name 75  "dist"
-                              Name 93  "UBO"
-                              MemberName 93(UBO) 0  "deltaT"
-                              MemberName 93(UBO) 1  "particleMass"
-                              MemberName 93(UBO) 2  "springStiffness"
-                              MemberName 93(UBO) 3  "damping"
-                              MemberName 93(UBO) 4  "restDistH"
-                              MemberName 93(UBO) 5  "restDistV"
-                              MemberName 93(UBO) 6  "restDistD"
-                              MemberName 93(UBO) 7  "sphereRadius"
-                              MemberName 93(UBO) 8  "spherePos"
-                              MemberName 93(UBO) 9  "gravity"
-                              MemberName 93(UBO) 10  "particleCount"
-                              Name 115  "ubo"
-                              MemberName 115(ubo) 0  "params"
-                              Name 124  ""
-                              Name 147  "index"
-                              Name 185  "Particle"
-                              MemberName 185(Particle) 0  "pos"
-                              MemberName 185(Particle) 1  "vel"
-                              MemberName 185(Particle) 2  "uv"
-                              MemberName 185(Particle) 3  "normal"
-                              MemberName 185(Particle) 4  "pinned"
-                              Name 201  "particleIn"
-                              MemberName 201(particleIn) 0  "@data"
-                              Name 210  "particleIn"
-                              Name 225  "particleOut"
-                              MemberName 225(particleOut) 0  "@data"
-                              Name 232  "particleOut"
-                              Name 254  "force"
-                              Name 267  "pos"
-                              Name 277  "vel"
-                              Name 297  "param"
-                              Name 301  "param"
-                              Name 303  "param"
-                              Name 326  "param"
-                              Name 330  "param"
-                              Name 332  "param"
-                              Name 359  "param"
-                              Name 363  "param"
-                              Name 365  "param"
-                              Name 387  "param"
-                              Name 391  "param"
-                              Name 393  "param"
-                              Name 425  "param"
-                              Name 429  "param"
-                              Name 431  "param"
-                              Name 458  "param"
-                              Name 462  "param"
-                              Name 464  "param"
-                              Name 499  "param"
-                              Name 503  "param"
-                              Name 505  "param"
-                              Name 536  "param"
-                              Name 540  "param"
-                              Name 542  "param"
-                              Name 561  "f"
-                              Name 610  "sphereDist"
-                              Name 662  "PushConstants"
-                              MemberName 662(PushConstants) 0  "calculateNormals"
-                              Name 669  "$Global"
-                              MemberName 669($Global) 0  "pushConstants"
-                              Name 677  ""
-                              Name 689  "normal"
-                              Name 711  "a"
-                              Name 724  "b"
-                              Name 741  "c"
-                              Name 959  "id"
-                              Name 961  "id"
-                              Name 963  "param"
-                              MemberDecorate 93(UBO) 0 Offset 0
-                              MemberDecorate 93(UBO) 1 Offset 4
-                              MemberDecorate 93(UBO) 2 Offset 8
-                              MemberDecorate 93(UBO) 3 Offset 12
-                              MemberDecorate 93(UBO) 4 Offset 16
-                              MemberDecorate 93(UBO) 5 Offset 20
-                              MemberDecorate 93(UBO) 6 Offset 24
-                              MemberDecorate 93(UBO) 7 Offset 28
-                              MemberDecorate 93(UBO) 8 Offset 32
-                              MemberDecorate 93(UBO) 9 Offset 48
-                              MemberDecorate 93(UBO) 10 Offset 64
-                              MemberDecorate 115(ubo) 0 Offset 0
-                              Decorate 115(ubo) Block
-                              Decorate 124 DescriptorSet 0
-                              Decorate 124 Binding 2
-                              MemberDecorate 185(Particle) 0 Offset 0
-                              MemberDecorate 185(Particle) 1 Offset 16
-                              MemberDecorate 185(Particle) 2 Offset 32
-                              MemberDecorate 185(Particle) 3 Offset 48
-                              MemberDecorate 185(Particle) 4 Offset 64
-                              Decorate 199 ArrayStride 80
-                              MemberDecorate 201(particleIn) 0 NonWritable
-                              MemberDecorate 201(particleIn) 0 Offset 0
-                              Decorate 201(particleIn) BufferBlock
-                              Decorate 210(particleIn) DescriptorSet 0
-                              Decorate 210(particleIn) Binding 0
-                              Decorate 223 ArrayStride 80
-                              MemberDecorate 225(particleOut) 0 Offset 0
-                              Decorate 225(particleOut) BufferBlock
-                              Decorate 232(particleOut) DescriptorSet 0
-                              Decorate 232(particleOut) Binding 1
-                              MemberDecorate 662(PushConstants) 0 Offset 0
-                              MemberDecorate 669($Global) 0 Offset 0
-                              Decorate 669($Global) Block
-                              Decorate 677 DescriptorSet 0
-                              Decorate 677 Binding 3
-                              Decorate 961(id) BuiltIn GlobalInvocationId
+                              Name 71  "dist"
+                              Name 91  "UBO"
+                              MemberName 91(UBO) 0  "deltaT"
+                              MemberName 91(UBO) 1  "particleMass"
+                              MemberName 91(UBO) 2  "springStiffness"
+                              MemberName 91(UBO) 3  "damping"
+                              MemberName 91(UBO) 4  "restDistH"
+                              MemberName 91(UBO) 5  "restDistV"
+                              MemberName 91(UBO) 6  "restDistD"
+                              MemberName 91(UBO) 7  "sphereRadius"
+                              MemberName 91(UBO) 8  "spherePos"
+                              MemberName 91(UBO) 9  "gravity"
+                              MemberName 91(UBO) 10  "particleCount"
+                              Name 113  "ubo"
+                              MemberName 113(ubo) 0  "params"
+                              Name 122  ""
+                              Name 144  "index"
+                              Name 182  "Particle"
+                              MemberName 182(Particle) 0  "pos"
+                              MemberName 182(Particle) 1  "vel"
+                              MemberName 182(Particle) 2  "uv"
+                              MemberName 182(Particle) 3  "normal"
+                              MemberName 182(Particle) 4  "pinned"
+                              Name 199  "particleIn"
+                              MemberName 199(particleIn) 0  "@data"
+                              Name 208  "particleIn"
+                              Name 222  "particleOut"
+                              MemberName 222(particleOut) 0  "@data"
+                              Name 230  "particleOut"
+                              Name 252  "force"
+                              Name 266  "pos"
+                              Name 276  "vel"
+                              Name 298  "param"
+                              Name 302  "param"
+                              Name 304  "param"
+                              Name 327  "param"
+                              Name 331  "param"
+                              Name 333  "param"
+                              Name 360  "param"
+                              Name 364  "param"
+                              Name 366  "param"
+                              Name 388  "param"
+                              Name 392  "param"
+                              Name 394  "param"
+                              Name 426  "param"
+                              Name 430  "param"
+                              Name 432  "param"
+                              Name 459  "param"
+                              Name 463  "param"
+                              Name 465  "param"
+                              Name 500  "param"
+                              Name 504  "param"
+                              Name 506  "param"
+                              Name 537  "param"
+                              Name 541  "param"
+                              Name 543  "param"
+                              Name 560  "f"
+                              Name 609  "sphereDist"
+                              Name 660  "PushConstants"
+                              MemberName 660(PushConstants) 0  "calculateNormals"
+                              Name 668  "$Global"
+                              MemberName 668($Global) 0  "pushConstants"
+                              Name 676  ""
+                              Name 687  "normal"
+                              Name 709  "a"
+                              Name 723  "b"
+                              Name 740  "c"
+                              Name 963  "id"
+                              Name 965  "id"
+                              Name 967  "param"
+                              MemberDecorate 91(UBO) 0 Offset 0
+                              MemberDecorate 91(UBO) 1 Offset 4
+                              MemberDecorate 91(UBO) 2 Offset 8
+                              MemberDecorate 91(UBO) 3 Offset 12
+                              MemberDecorate 91(UBO) 4 Offset 16
+                              MemberDecorate 91(UBO) 5 Offset 20
+                              MemberDecorate 91(UBO) 6 Offset 24
+                              MemberDecorate 91(UBO) 7 Offset 28
+                              MemberDecorate 91(UBO) 8 Offset 32
+                              MemberDecorate 91(UBO) 9 Offset 48
+                              MemberDecorate 91(UBO) 10 Offset 64
+                              MemberDecorate 113(ubo) 0 Offset 0
+                              Decorate 113(ubo) Block
+                              Decorate 122 DescriptorSet 0
+                              Decorate 122 Binding 2
+                              MemberDecorate 182(Particle) 0 Offset 0
+                              MemberDecorate 182(Particle) 1 Offset 16
+                              MemberDecorate 182(Particle) 2 Offset 32
+                              MemberDecorate 182(Particle) 3 Offset 48
+                              MemberDecorate 182(Particle) 4 Offset 64
+                              Decorate 197 ArrayStride 80
+                              MemberDecorate 199(particleIn) 0 NonWritable
+                              MemberDecorate 199(particleIn) 0 Offset 0
+                              Decorate 199(particleIn) BufferBlock
+                              Decorate 208(particleIn) DescriptorSet 0
+                              Decorate 208(particleIn) Binding 0
+                              Decorate 220 ArrayStride 80
+                              MemberDecorate 222(particleOut) 0 Offset 0
+                              Decorate 222(particleOut) BufferBlock
+                              Decorate 230(particleOut) DescriptorSet 0
+                              Decorate 230(particleOut) Binding 1
+                              MemberDecorate 660(PushConstants) 0 Offset 0
+                              MemberDecorate 668($Global) 0 Offset 0
+                              Decorate 668($Global) Block
+                              Decorate 676 DescriptorSet 0
+                              Decorate 676 Binding 3
+                              Decorate 965(id) BuiltIn GlobalInvocationId
                4:             TypeVoid
                5:             TypeFunction 4
                8:             TypeFloat 32
@@ -177,1049 +177,1046 @@ spv.debuginfo.hlsl.comp
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:             TypeVector 8(float) 3
-              19:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+              19:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
               20:             TypePointer Function 18(fvec3)
               21:     11(int) Constant 7
-              22:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 19 21 16
+              22:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 19 21 16
               23:             TypePointer Function 8(float)
-              24:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
+              24:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
               25:             TypeFunction 18(fvec3) 20(ptr) 20(ptr) 23(ptr)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 19 19 19 10
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 35
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 19 19 19 10
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 35
               36:     11(int) Constant 75
               38:     11(int) Constant 1
               39:     11(int) Constant 4
               40:     11(int) Constant 5
-              37:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 38 39 34 40
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 32 26 34 36 16 37 32 17 36
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 44 19 34 36 16 33 39 38
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              37:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 38 39 34 40
+              33:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 32 26 34 36 16 37 32 17 36
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 42 19 34 36 16 33 39 38
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
               49:     11(int) Constant 2
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 48 19 34 36 16 33 39 49
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 10 34 36 16 33 39 17
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 48 19 34 36 16 33 39 49
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 52 10 34 36 16 33 39 17
               54:             TypeVector 11(int) 3
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 13 17
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 13 17
               56:             TypePointer Function 54(ivec3)
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 55 21 16
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 55 21 16
               58:             TypeFunction 4 56(ptr)
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 4 55
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 4 55
               65:     11(int) Constant 82
-              64:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 63 59 34 65 16 37 63 17 65
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 69 55 34 65 16 64 39 38
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 63 59 34 65 16 37 63 17 65
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 67 55 34 65 16 64 39 38
               74:     11(int) Constant 76
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 77 19 34 74 16 33 39
-              83:     11(int) Constant 77
-              86:             TypeVector 8(float) 4
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 39
-              88:             TypeInt 32 1
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 89 14 39 16
-              91:             TypeVector 88(int) 2
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 90 49
-         93(UBO):             TypeStruct 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 86(fvec4) 86(fvec4) 91(ivec2)
-              96:     11(int) Constant 48
-              97:     11(int) Constant 20
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             100:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             102:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 95 10 34 96 97 16 16 17
-             107:     11(int) Constant 50
-             108:     11(int) Constant 16
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 106 87 34 107 108 16 16 17
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 106 87 34 107 108 16 16 17
-             112:     11(int) Constant 51
-             110:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 111 92 34 112 97 16 16 17
-             113:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 114 38 34 83 16 37 114 16 17 94 98 99 100 101 102 103 104 105 109 110
-        115(ubo):             TypeStruct 93(UBO)
-             118:     11(int) Constant 56
-             119:     11(int) Constant 12
-             116:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 117 113 34 118 119 16 16 17
-             120:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 121 38 34 83 16 37 121 16 17 116
-             122:             TypePointer Uniform 115(ubo)
-             123:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 120 49 16
-             124:    122(ptr) Variable Uniform
-             126:     11(int) Constant 8
-             125:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 120 34 83 16 37 1 124 126
-             127:     88(int) Constant 0
-             128:     88(int) Constant 2
-             129:             TypePointer Uniform 8(float)
-             130:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 49 16
-             144:     11(int) Constant 83
-             145:             TypePointer Function 11(int)
-             146:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 21 16
-             148:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 149 13 34 144 16 64 39
-             153:     88(int) Constant 10
-             154:             TypePointer Uniform 88(int)
-             155:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 90 49 16
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 73 19 34 74 16 33 39
+              82:     11(int) Constant 77
+              84:             TypeVector 8(float) 4
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 39
+              86:             TypeInt 32 1
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 87 14 39 16
+              89:             TypeVector 86(int) 2
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 88 49
+         91(UBO):             TypeStruct 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 8(float) 84(fvec4) 84(fvec4) 89(ivec2)
+              94:     11(int) Constant 48
+              95:     11(int) Constant 20
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+              97:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+              99:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+             101:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 93 10 34 94 95 16 16 17
+             105:     11(int) Constant 50
+             106:     11(int) Constant 16
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 104 85 34 105 106 16 16 17
+             107:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 104 85 34 105 106 16 16 17
+             110:     11(int) Constant 51
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 109 90 34 110 95 16 16 17
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 112 38 34 82 16 37 112 16 17 92 96 97 98 99 100 101 102 103 107 108
+        113(ubo):             TypeStruct 91(UBO)
+             116:     11(int) Constant 56
+             117:     11(int) Constant 12
+             114:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 115 111 34 116 117 16 16 17
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 119 38 34 82 16 37 119 16 17 114
+             120:             TypePointer Uniform 113(ubo)
+             121:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 118 49 16
+             122:    120(ptr) Variable Uniform
+             124:     11(int) Constant 8
+             123:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 118 34 82 16 37 2 122 124
+             125:     86(int) Constant 0
+             126:     86(int) Constant 2
+             127:             TypePointer Uniform 8(float)
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 49 16
+             142:             TypePointer Function 11(int)
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 21 16
+             147:     11(int) Constant 83
+             145:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 146 13 34 147 16 64 39
+             152:     86(int) Constant 10
+             153:             TypePointer Uniform 86(int)
+             154:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 88 49 16
              164:     11(int) Constant 84
-             172:             TypeBool
-             174:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 173 14 49 16
-             180:     11(int) Constant 85
-             184:     11(int) Constant 88
-   185(Particle):             TypeStruct 86(fvec4) 86(fvec4) 86(fvec4) 86(fvec4) 8(float)
-             188:     11(int) Constant 30
-             189:     11(int) Constant 15
-             186:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 187 87 34 188 189 16 16 17
-             190:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 187 87 34 188 189 16 16 17
-             191:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 187 87 34 188 189 16 16 17
-             192:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 187 87 34 188 189 16 16 17
-             195:     11(int) Constant 31
-             196:     11(int) Constant 14
-             193:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 194 10 34 195 196 16 16 17
-             197:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 198 38 34 184 16 37 198 16 17 186 190 191 192 193
-             199:             TypeRuntimeArray 185(Particle)
-             200:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 197 16
- 201(particleIn):             TypeStruct 199
-             204:     11(int) Constant 35
-             205:     11(int) Constant 28
-             202:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 203 200 34 204 205 16 16 17
-             206:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 207 38 34 184 16 37 207 16 17 202
-             208:             TypePointer Uniform 201(particleIn)
-             209:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 206 49 16
- 210(particleIn):    208(ptr) Variable Uniform
-             211:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 207 206 34 184 16 37 207 210(particleIn) 126
-             213:     88(int) Constant 4
+             171:             TypeBool
+             173:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 172 14 49 16
+             179:     11(int) Constant 85
+   182(Particle):             TypeStruct 84(fvec4) 84(fvec4) 84(fvec4) 84(fvec4) 8(float)
+             185:     11(int) Constant 30
+             186:     11(int) Constant 15
+             183:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 184 85 34 185 186 16 16 17
+             187:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 184 85 34 185 186 16 16 17
+             188:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 184 85 34 185 186 16 16 17
+             189:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 184 85 34 185 186 16 16 17
+             192:     11(int) Constant 31
+             193:     11(int) Constant 14
+             190:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 191 10 34 192 193 16 16 17
+             196:     11(int) Constant 88
+             194:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 195 38 34 196 16 37 195 16 17 183 187 188 189 190
+             197:             TypeRuntimeArray 182(Particle)
+             198:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 194 16
+ 199(particleIn):             TypeStruct 197
+             202:     11(int) Constant 35
+             203:     11(int) Constant 28
+             200:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 201 198 34 202 203 16 16 17
+             204:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 205 38 34 196 16 37 205 16 17 200
+             206:             TypePointer Uniform 199(particleIn)
+             207:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 204 49 16
+ 208(particleIn):    206(ptr) Variable Uniform
+             209:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 205 204 34 196 16 37 205 208(particleIn) 124
+             213:     86(int) Constant 4
              216:    8(float) Constant 1065353216
-             222:     11(int) Constant 89
-             223:             TypeRuntimeArray 185(Particle)
-             224:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 197 16
-225(particleOut):             TypeStruct 223
-             227:     11(int) Constant 37
-             226:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 203 224 34 227 188 16 16 17
-             228:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 229 38 34 222 16 37 229 16 17 226
-             230:             TypePointer Uniform 225(particleOut)
-             231:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 228 49 16
-232(particleOut):    230(ptr) Variable Uniform
-             233:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 229 228 34 222 16 37 229 232(particleOut) 126
-             236:             TypePointer Uniform 86(fvec4)
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 87 49 16
-             242:     11(int) Constant 90
-             244:     88(int) Constant 1
+             220:             TypeRuntimeArray 182(Particle)
+             221:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 194 16
+222(particleOut):             TypeStruct 220
+             224:     11(int) Constant 37
+             223:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 201 221 34 224 185 16 16 17
+             227:     11(int) Constant 89
+             225:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 226 38 34 227 16 37 226 16 17 223
+             228:             TypePointer Uniform 222(particleOut)
+             229:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 225 49 16
+230(particleOut):    228(ptr) Variable Uniform
+             231:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 226 225 34 227 16 37 226 230(particleOut) 124
+             236:             TypePointer Uniform 84(fvec4)
+             237:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 85 49 16
+             243:     11(int) Constant 90
+             244:     86(int) Constant 1
              245:    8(float) Constant 0
-             246:   86(fvec4) ConstantComposite 245 245 245 245
+             246:   84(fvec4) ConstantComposite 245 245 245 245
              249:     11(int) Constant 91
-             253:     11(int) Constant 95
-             255:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 256 19 34 253 16 64 39
-             258:     88(int) Constant 9
-             266:     11(int) Constant 97
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 269 19 34 266 16 64 39
-             276:     11(int) Constant 98
-             278:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 279 19 34 276 16 64 39
-             286:     11(int) Constant 102
-             294:     11(int) Constant 103
-             311:     11(int) Constant 106
-             323:     11(int) Constant 107
-             340:     11(int) Constant 110
-             352:     11(int) Constant 111
-             358:     88(int) Constant 5
-             373:     11(int) Constant 114
-             381:     11(int) Constant 115
-             401:     11(int) Constant 118
-             417:     11(int) Constant 119
-             424:     88(int) Constant 6
-             439:     11(int) Constant 122
-             451:     11(int) Constant 123
-             472:     11(int) Constant 126
-             492:     11(int) Constant 127
-             513:     11(int) Constant 130
-             529:     11(int) Constant 131
-             550:     11(int) Constant 134
-             551:     88(int) Constant 3
-             560:     11(int) Constant 137
-             562:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 563 19 34 560 16 64 39
-             571:     11(int) Constant 138
-             579:    8(float) Constant 1056964608
-             595:     11(int) Constant 139
-             609:     11(int) Constant 142
-             611:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 612 19 34 609 16 64 39
-             618:     88(int) Constant 8
-             624:     11(int) Constant 143
-             627:     88(int) Constant 7
-             630:    8(float) Constant 1008981770
-             637:     11(int) Constant 145
-             656:     11(int) Constant 147
-             661:     11(int) Constant 151
-662(PushConstants):             TypeStruct 11(int)
-             665:     11(int) Constant 67
-             666:     11(int) Constant 23
-             663:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 664 13 34 665 666 16 16 17
-             667:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 668 38 34 661 16 37 668 16 17 663
-    669($Global):             TypeStruct 662(PushConstants)
-             672:     11(int) Constant 71
-             670:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 671 667 34 672 189 16 16 17
-             673:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 674 38 34 661 16 37 674 16 17 670
-             675:             TypePointer Uniform 669($Global)
-             676:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 673 49 16
-             677:    675(ptr) Variable Uniform
-             678:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 673 34 661 16 37 1 677 126
-             679:             TypePointer Uniform 11(int)
-             680:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 49 16
-             688:     11(int) Constant 152
-             690:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 187 19 34 688 16 64 39
-             692:   18(fvec3) ConstantComposite 245 245 245
-             694:     11(int) Constant 154
-             702:     11(int) Constant 155
-             710:     11(int) Constant 156
-             712:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 713 19 34 710 16 64 39
-             723:     11(int) Constant 157
-             725:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 726 19 34 723 16 64 39
-             740:     11(int) Constant 158
-             742:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 743 19 34 740 16 64 39
-             756:     11(int) Constant 159
-             768:     11(int) Constant 161
-             780:     11(int) Constant 162
-             792:     11(int) Constant 163
-             805:     11(int) Constant 164
-             814:     11(int) Constant 165
-             826:     11(int) Constant 168
-             838:     11(int) Constant 169
-             846:     11(int) Constant 170
-             858:     11(int) Constant 171
-             871:     11(int) Constant 172
-             880:     11(int) Constant 173
-             892:     11(int) Constant 175
-             904:     11(int) Constant 176
-             913:     11(int) Constant 177
-             926:     11(int) Constant 178
-             938:     11(int) Constant 179
-             950:     11(int) Constant 182
-             960:             TypePointer Input 54(ivec3)
-         961(id):    960(ptr) Variable Input
-                              Line 1 82 1
+             255:     11(int) Constant 95
+             253:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 254 19 34 255 16 64 39
+             259:     86(int) Constant 9
+             269:     11(int) Constant 97
+             267:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 268 19 34 269 16 64 39
+             279:     11(int) Constant 98
+             277:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 278 19 34 279 16 64 39
+             288:     11(int) Constant 102
+             296:     11(int) Constant 103
+             313:     11(int) Constant 106
+             325:     11(int) Constant 107
+             342:     11(int) Constant 110
+             354:     11(int) Constant 111
+             359:     86(int) Constant 5
+             375:     11(int) Constant 114
+             383:     11(int) Constant 115
+             403:     11(int) Constant 118
+             419:     11(int) Constant 119
+             425:     86(int) Constant 6
+             441:     11(int) Constant 122
+             453:     11(int) Constant 123
+             474:     11(int) Constant 126
+             494:     11(int) Constant 127
+             515:     11(int) Constant 130
+             531:     11(int) Constant 131
+             549:     86(int) Constant 3
+             553:     11(int) Constant 134
+             563:     11(int) Constant 137
+             561:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 562 19 34 563 16 64 39
+             573:     11(int) Constant 138
+             580:    8(float) Constant 1056964608
+             597:     11(int) Constant 139
+             612:     11(int) Constant 142
+             610:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 611 19 34 612 16 64 39
+             619:     86(int) Constant 8
+             626:     11(int) Constant 143
+             628:     86(int) Constant 7
+             631:    8(float) Constant 1008981770
+             639:     11(int) Constant 145
+             658:     11(int) Constant 147
+660(PushConstants):             TypeStruct 11(int)
+             663:     11(int) Constant 67
+             664:     11(int) Constant 23
+             661:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 662 13 34 663 664 16 16 17
+             667:     11(int) Constant 151
+             665:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 666 38 34 667 16 37 666 16 17 661
+    668($Global):             TypeStruct 660(PushConstants)
+             671:     11(int) Constant 71
+             669:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 670 665 34 671 186 16 16 17
+             672:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 673 38 34 667 16 37 673 16 17 669
+             674:             TypePointer Uniform 668($Global)
+             675:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 672 49 16
+             676:    674(ptr) Variable Uniform
+             677:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 672 34 667 16 37 2 676 124
+             678:             TypePointer Uniform 11(int)
+             679:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 49 16
+             689:     11(int) Constant 152
+             688:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 184 19 34 689 16 64 39
+             693:   18(fvec3) ConstantComposite 245 245 245
+             696:     11(int) Constant 154
+             704:     11(int) Constant 155
+             712:     11(int) Constant 156
+             710:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 711 19 34 712 16 64 39
+             726:     11(int) Constant 157
+             724:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 725 19 34 726 16 64 39
+             743:     11(int) Constant 158
+             741:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 742 19 34 743 16 64 39
+             758:     11(int) Constant 159
+             770:     11(int) Constant 161
+             782:     11(int) Constant 162
+             794:     11(int) Constant 163
+             807:     11(int) Constant 164
+             816:     11(int) Constant 165
+             829:     11(int) Constant 168
+             841:     11(int) Constant 169
+             849:     11(int) Constant 170
+             861:     11(int) Constant 171
+             874:     11(int) Constant 172
+             883:     11(int) Constant 173
+             895:     11(int) Constant 175
+             907:     11(int) Constant 176
+             916:     11(int) Constant 177
+             929:     11(int) Constant 178
+             941:     11(int) Constant 179
+             954:     11(int) Constant 182
+             964:             TypePointer Input 54(ivec3)
+         965(id):    964(ptr) Variable Input
          6(main):           4 Function None 5
                7:             Label
-         959(id):     56(ptr) Variable Function
-      963(param):     56(ptr) Variable Function
-                              Line 1 82 0
-             962:   54(ivec3) Load 961(id)
-                              Store 959(id) 962
-             964:   54(ivec3) Load 959(id)
-                              Store 963(param) 964
-             965:           4 FunctionCall 61(@main(vu3;) 963(param)
+         963(id):     56(ptr) Variable Function
+      967(param):     56(ptr) Variable Function
+             966:   54(ivec3) Load 965(id)
+                              Store 963(id) 966
+             968:   54(ivec3) Load 963(id)
+                              Store 967(param) 968
+             969:           4 FunctionCall 61(@main(vu3;) 967(param)
                               Return
                               FunctionEnd
-                              Line 1 75 1
 30(springForce(vf3;vf3;f1;):   18(fvec3) Function None 25
           27(p0):     20(ptr) FunctionParameter
           28(p1):     20(ptr) FunctionParameter
     29(restDist):     23(ptr) FunctionParameter
               31:             Label
-        75(dist):     20(ptr) Variable Function
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 33
-              42:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 36 36 16 16
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 43 27(p0) 46
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 47 28(p1) 46
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 51 29(restDist) 46
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 33 30(springForce(vf3;vf3;f1;)
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 33
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 74 74 16 16
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 76 75(dist) 46
-              79:   18(fvec3) Load 27(p0)
-              80:   18(fvec3) Load 28(p1)
-              81:   18(fvec3) FSub 79 80
-                              Store 75(dist) 81
-              82:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 83 83 16 16
-              84:   18(fvec3) Load 75(dist)
-              85:   18(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 84
-             131:    129(ptr) AccessChain 124 127 128
-             132:    8(float) Load 131
-             133:   18(fvec3) VectorTimesScalar 85 132
-             134:   18(fvec3) Load 75(dist)
-             135:    8(float) ExtInst 3(GLSL.std.450) 66(Length) 134
-             136:    8(float) Load 29(restDist)
-             137:    8(float) FSub 135 136
-             138:   18(fvec3) VectorTimesScalar 133 137
-                              ReturnValue 138
+        71(dist):     20(ptr) Variable Function
+              45:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 33
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 36 36 16 16
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 41 27(p0) 44
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 47 28(p1) 44
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 51 29(restDist) 44
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 33 30(springForce(vf3;vf3;f1;)
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 74 74 16 16
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 72 71(dist) 44
+              77:   18(fvec3) Load 27(p0)
+              78:   18(fvec3) Load 28(p1)
+              79:   18(fvec3) FSub 77 78
+                              Store 71(dist) 79
+              81:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 82 82 16 16
+              80:   18(fvec3) Load 71(dist)
+              83:   18(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 80
+             129:    127(ptr) AccessChain 122 125 126
+             130:    8(float) Load 129
+             131:   18(fvec3) VectorTimesScalar 83 130
+             132:   18(fvec3) Load 71(dist)
+             133:    8(float) ExtInst 3(GLSL.std.450) 66(Length) 132
+             134:    8(float) Load 29(restDist)
+             135:    8(float) FSub 133 134
+             136:   18(fvec3) VectorTimesScalar 131 135
+                              ReturnValue 136
                               FunctionEnd
-                              Line 1 82 1
   61(@main(vu3;):           4 Function None 58
           60(id):     56(ptr) FunctionParameter
               62:             Label
-      147(index):    145(ptr) Variable Function
-      254(force):     20(ptr) Variable Function
-        267(pos):     20(ptr) Variable Function
-        277(vel):     20(ptr) Variable Function
-      297(param):     20(ptr) Variable Function
-      301(param):     20(ptr) Variable Function
-      303(param):     23(ptr) Variable Function
-      326(param):     20(ptr) Variable Function
-      330(param):     20(ptr) Variable Function
-      332(param):     23(ptr) Variable Function
-      359(param):     20(ptr) Variable Function
-      363(param):     20(ptr) Variable Function
-      365(param):     23(ptr) Variable Function
-      387(param):     20(ptr) Variable Function
-      391(param):     20(ptr) Variable Function
-      393(param):     23(ptr) Variable Function
-      425(param):     20(ptr) Variable Function
-      429(param):     20(ptr) Variable Function
-      431(param):     23(ptr) Variable Function
-      458(param):     20(ptr) Variable Function
-      462(param):     20(ptr) Variable Function
-      464(param):     23(ptr) Variable Function
-      499(param):     20(ptr) Variable Function
-      503(param):     20(ptr) Variable Function
-      505(param):     23(ptr) Variable Function
-      536(param):     20(ptr) Variable Function
-      540(param):     20(ptr) Variable Function
-      542(param):     23(ptr) Variable Function
-          561(f):     20(ptr) Variable Function
- 610(sphereDist):     20(ptr) Variable Function
-     689(normal):     20(ptr) Variable Function
-          711(a):     20(ptr) Variable Function
-          724(b):     20(ptr) Variable Function
-          741(c):     20(ptr) Variable Function
-              66:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 65 65 16 16
-              70:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 68 60(id) 46
-             141:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 64 61(@main(vu3;)
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 144 144 16 16
-             150:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 148 147(index) 46
-             151:    145(ptr) AccessChain 60(id) 38
-             152:     11(int) Load 151
-             156:    154(ptr) AccessChain 124 127 153 16
-             157:     88(int) Load 156
-             158:     11(int) Bitcast 157
-             159:     11(int) IMul 152 158
-             160:    145(ptr) AccessChain 60(id) 16
-             161:     11(int) Load 160
-             162:     11(int) IAdd 159 161
-                              Store 147(index) 162
-             163:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 164 164 16 16
-             165:     11(int) Load 147(index)
-             166:    154(ptr) AccessChain 124 127 153 16
-             167:     88(int) Load 166
-             168:    154(ptr) AccessChain 124 127 153 38
-             169:     88(int) Load 168
-             170:     88(int) IMul 167 169
-             171:     11(int) Bitcast 170
-             175:   172(bool) UGreaterThan 165 171
-                              SelectionMerge 177 None
-                              BranchConditional 175 176 177
-             176:               Label
-             178:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             179:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 180 180 16 16
+      144(index):    142(ptr) Variable Function
+      252(force):     20(ptr) Variable Function
+        266(pos):     20(ptr) Variable Function
+        276(vel):     20(ptr) Variable Function
+      298(param):     20(ptr) Variable Function
+      302(param):     20(ptr) Variable Function
+      304(param):     23(ptr) Variable Function
+      327(param):     20(ptr) Variable Function
+      331(param):     20(ptr) Variable Function
+      333(param):     23(ptr) Variable Function
+      360(param):     20(ptr) Variable Function
+      364(param):     20(ptr) Variable Function
+      366(param):     23(ptr) Variable Function
+      388(param):     20(ptr) Variable Function
+      392(param):     20(ptr) Variable Function
+      394(param):     23(ptr) Variable Function
+      426(param):     20(ptr) Variable Function
+      430(param):     20(ptr) Variable Function
+      432(param):     23(ptr) Variable Function
+      459(param):     20(ptr) Variable Function
+      463(param):     20(ptr) Variable Function
+      465(param):     23(ptr) Variable Function
+      500(param):     20(ptr) Variable Function
+      504(param):     20(ptr) Variable Function
+      506(param):     23(ptr) Variable Function
+      537(param):     20(ptr) Variable Function
+      541(param):     20(ptr) Variable Function
+      543(param):     23(ptr) Variable Function
+          560(f):     20(ptr) Variable Function
+ 609(sphereDist):     20(ptr) Variable Function
+     687(normal):     20(ptr) Variable Function
+          709(a):     20(ptr) Variable Function
+          723(b):     20(ptr) Variable Function
+          740(c):     20(ptr) Variable Function
+              69:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 66 60(id) 44
+             141:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 65 65 16 16
+             140:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 64 61(@main(vu3;)
+             149:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 147 147 16 16
+             148:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 145 144(index) 44
+             150:    142(ptr) AccessChain 60(id) 38
+             151:     11(int) Load 150
+             155:    153(ptr) AccessChain 122 125 152 16
+             156:     86(int) Load 155
+             157:     11(int) Bitcast 156
+             158:     11(int) IMul 151 157
+             159:    142(ptr) AccessChain 60(id) 16
+             160:     11(int) Load 159
+             161:     11(int) IAdd 158 160
+                              Store 144(index) 161
+             163:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 164 164 16 16
+             162:     11(int) Load 144(index)
+             165:    153(ptr) AccessChain 122 125 152 16
+             166:     86(int) Load 165
+             167:    153(ptr) AccessChain 122 125 152 38
+             168:     86(int) Load 167
+             169:     86(int) IMul 166 168
+             170:     11(int) Bitcast 169
+             174:   171(bool) UGreaterThan 162 170
+                              SelectionMerge 176 None
+                              BranchConditional 174 175 176
+             175:               Label
+             177:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             178:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 179 179 16 16
                                 Return
-             177:             Label
-             182:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             183:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 184 184 16 16
-             212:     11(int) Load 147(index)
-             214:    129(ptr) AccessChain 210(particleIn) 127 212 213
+             176:             Label
+             211:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             212:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 196 196 16 16
+             210:     11(int) Load 144(index)
+             214:    127(ptr) AccessChain 208(particleIn) 125 210 213
              215:    8(float) Load 214
-             217:   172(bool) FOrdEqual 215 216
+             217:   171(bool) FOrdEqual 215 216
                               SelectionMerge 219 None
                               BranchConditional 217 218 219
              218:               Label
-             220:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             221:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 222 222 16 16
-             234:     11(int)   Load 147(index)
-             235:     11(int)   Load 147(index)
-             238:    236(ptr)   AccessChain 232(particleOut) 127 235 127
-             239:   86(fvec4)   Load 238
-             240:    236(ptr)   AccessChain 232(particleOut) 127 234 127
+             233:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             234:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 227 227 16 16
+             232:     11(int)   Load 144(index)
+             235:     11(int)   Load 144(index)
+             238:    236(ptr)   AccessChain 230(particleOut) 125 235 125
+             239:   84(fvec4)   Load 238
+             240:    236(ptr)   AccessChain 230(particleOut) 125 232 125
                                 Store 240 239
-             241:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 242 242 16 16
-             243:     11(int)   Load 147(index)
-             247:    236(ptr)   AccessChain 232(particleOut) 127 243 244
+             242:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 243 243 16 16
+             241:     11(int)   Load 144(index)
+             247:    236(ptr)   AccessChain 230(particleOut) 125 241 244
                                 Store 247 246
-             248:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 249 249 16 16
+             248:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 249 249 16 16
                                 Return
              219:             Label
-             251:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             252:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 253 253 16 16
-             257:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 255 254(force) 46
-             259:    236(ptr) AccessChain 124 127 258
-             260:   86(fvec4) Load 259
-             261:   18(fvec3) VectorShuffle 260 260 0 1 2
-             262:    129(ptr) AccessChain 124 127 244
-             263:    8(float) Load 262
-             264:   18(fvec3) VectorTimesScalar 261 263
-                              Store 254(force) 264
-             265:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 266 266 16 16
-             270:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 268 267(pos) 46
-             271:     11(int) Load 147(index)
-             272:    236(ptr) AccessChain 210(particleIn) 127 271 127
-             273:   86(fvec4) Load 272
-             274:   18(fvec3) VectorShuffle 273 273 0 1 2
-                              Store 267(pos) 274
-             275:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 276 276 16 16
-             280:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 278 277(vel) 46
-             281:     11(int) Load 147(index)
-             282:    236(ptr) AccessChain 210(particleIn) 127 281 244
-             283:   86(fvec4) Load 282
-             284:   18(fvec3) VectorShuffle 283 283 0 1 2
-                              Store 277(vel) 284
-             285:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 286 286 16 16
-             287:    145(ptr) AccessChain 60(id) 16
-             288:     11(int) Load 287
-             289:   172(bool) UGreaterThan 288 16
-                              SelectionMerge 291 None
-                              BranchConditional 289 290 291
-             290:               Label
-             292:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             293:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 294 294 16 16
-             295:     11(int)   Load 147(index)
-             296:     11(int)   ISub 295 38
-             298:    236(ptr)   AccessChain 210(particleIn) 127 296 127
-             299:   86(fvec4)   Load 298
-             300:   18(fvec3)   VectorShuffle 299 299 0 1 2
-                                Store 297(param) 300
-             302:   18(fvec3)   Load 267(pos)
-                                Store 301(param) 302
-             304:    129(ptr)   AccessChain 124 127 213
-             305:    8(float)   Load 304
-                                Store 303(param) 305
-             306:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 297(param) 301(param) 303(param)
-             307:   18(fvec3)   Load 254(force)
-             308:   18(fvec3)   FAdd 307 306
-                                Store 254(force) 308
-                                Branch 291
-             291:             Label
-             309:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             310:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 311 311 16 16
-             312:    145(ptr) AccessChain 60(id) 16
-             313:     11(int) Load 312
-             314:    154(ptr) AccessChain 124 127 153 16
-             315:     88(int) Load 314
-             316:     88(int) ISub 315 244
-             317:     11(int) Bitcast 316
-             318:   172(bool) ULessThan 313 317
-                              SelectionMerge 320 None
-                              BranchConditional 318 319 320
-             319:               Label
-             321:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             322:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 323 323 16 16
-             324:     11(int)   Load 147(index)
-             325:     11(int)   IAdd 324 38
-             327:    236(ptr)   AccessChain 210(particleIn) 127 325 127
-             328:   86(fvec4)   Load 327
-             329:   18(fvec3)   VectorShuffle 328 328 0 1 2
-                                Store 326(param) 329
-             331:   18(fvec3)   Load 267(pos)
-                                Store 330(param) 331
-             333:    129(ptr)   AccessChain 124 127 213
-             334:    8(float)   Load 333
-                                Store 332(param) 334
-             335:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 326(param) 330(param) 332(param)
-             336:   18(fvec3)   Load 254(force)
-             337:   18(fvec3)   FAdd 336 335
-                                Store 254(force) 337
-                                Branch 320
-             320:             Label
-             338:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             339:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 340 340 16 16
-             341:    145(ptr) AccessChain 60(id) 38
-             342:     11(int) Load 341
-             343:    154(ptr) AccessChain 124 127 153 38
-             344:     88(int) Load 343
-             345:     88(int) ISub 344 244
-             346:     11(int) Bitcast 345
-             347:   172(bool) ULessThan 342 346
-                              SelectionMerge 349 None
-                              BranchConditional 347 348 349
-             348:               Label
-             350:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             351:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 352 352 16 16
-             353:     11(int)   Load 147(index)
-             354:    154(ptr)   AccessChain 124 127 153 16
-             355:     88(int)   Load 354
-             356:     11(int)   Bitcast 355
-             357:     11(int)   IAdd 353 356
-             360:    236(ptr)   AccessChain 210(particleIn) 127 357 127
-             361:   86(fvec4)   Load 360
-             362:   18(fvec3)   VectorShuffle 361 361 0 1 2
-                                Store 359(param) 362
-             364:   18(fvec3)   Load 267(pos)
-                                Store 363(param) 364
-             366:    129(ptr)   AccessChain 124 127 358
-             367:    8(float)   Load 366
-                                Store 365(param) 367
-             368:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 359(param) 363(param) 365(param)
-             369:   18(fvec3)   Load 254(force)
-             370:   18(fvec3)   FAdd 369 368
-                                Store 254(force) 370
-                                Branch 349
-             349:             Label
-             371:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             372:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 373 373 16 16
-             374:    145(ptr) AccessChain 60(id) 38
-             375:     11(int) Load 374
-             376:   172(bool) UGreaterThan 375 16
-                              SelectionMerge 378 None
-                              BranchConditional 376 377 378
-             377:               Label
-             379:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             380:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 381 381 16 16
-             382:     11(int)   Load 147(index)
-             383:    154(ptr)   AccessChain 124 127 153 16
-             384:     88(int)   Load 383
-             385:     11(int)   Bitcast 384
-             386:     11(int)   ISub 382 385
-             388:    236(ptr)   AccessChain 210(particleIn) 127 386 127
-             389:   86(fvec4)   Load 388
-             390:   18(fvec3)   VectorShuffle 389 389 0 1 2
-                                Store 387(param) 390
-             392:   18(fvec3)   Load 267(pos)
-                                Store 391(param) 392
-             394:    129(ptr)   AccessChain 124 127 358
-             395:    8(float)   Load 394
-                                Store 393(param) 395
-             396:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 387(param) 391(param) 393(param)
-             397:   18(fvec3)   Load 254(force)
-             398:   18(fvec3)   FAdd 397 396
-                                Store 254(force) 398
-                                Branch 378
-             378:             Label
-             399:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             400:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 401 401 16 16
-             402:    145(ptr) AccessChain 60(id) 16
-             403:     11(int) Load 402
-             404:   172(bool) UGreaterThan 403 16
-             405:    145(ptr) AccessChain 60(id) 38
-             406:     11(int) Load 405
-             407:    154(ptr) AccessChain 124 127 153 38
-             408:     88(int) Load 407
-             409:     88(int) ISub 408 244
-             410:     11(int) Bitcast 409
-             411:   172(bool) ULessThan 406 410
-             412:   172(bool) LogicalAnd 404 411
-                              SelectionMerge 414 None
-                              BranchConditional 412 413 414
-             413:               Label
-             415:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             416:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 417 417 16 16
-             418:     11(int)   Load 147(index)
-             419:    154(ptr)   AccessChain 124 127 153 16
-             420:     88(int)   Load 419
-             421:     11(int)   Bitcast 420
-             422:     11(int)   IAdd 418 421
-             423:     11(int)   ISub 422 38
-             426:    236(ptr)   AccessChain 210(particleIn) 127 423 127
-             427:   86(fvec4)   Load 426
-             428:   18(fvec3)   VectorShuffle 427 427 0 1 2
-                                Store 425(param) 428
-             430:   18(fvec3)   Load 267(pos)
-                                Store 429(param) 430
-             432:    129(ptr)   AccessChain 124 127 424
-             433:    8(float)   Load 432
-                                Store 431(param) 433
-             434:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 425(param) 429(param) 431(param)
-             435:   18(fvec3)   Load 254(force)
-             436:   18(fvec3)   FAdd 435 434
-                                Store 254(force) 436
-                                Branch 414
-             414:             Label
-             437:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             438:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 439 439 16 16
-             440:    145(ptr) AccessChain 60(id) 16
-             441:     11(int) Load 440
-             442:   172(bool) UGreaterThan 441 16
-             443:    145(ptr) AccessChain 60(id) 38
-             444:     11(int) Load 443
-             445:   172(bool) UGreaterThan 444 16
-             446:   172(bool) LogicalAnd 442 445
-                              SelectionMerge 448 None
-                              BranchConditional 446 447 448
-             447:               Label
-             449:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             450:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 451 451 16 16
-             452:     11(int)   Load 147(index)
-             453:    154(ptr)   AccessChain 124 127 153 16
-             454:     88(int)   Load 453
-             455:     11(int)   Bitcast 454
-             456:     11(int)   ISub 452 455
-             457:     11(int)   ISub 456 38
-             459:    236(ptr)   AccessChain 210(particleIn) 127 457 127
-             460:   86(fvec4)   Load 459
-             461:   18(fvec3)   VectorShuffle 460 460 0 1 2
-                                Store 458(param) 461
-             463:   18(fvec3)   Load 267(pos)
-                                Store 462(param) 463
-             465:    129(ptr)   AccessChain 124 127 424
-             466:    8(float)   Load 465
-                                Store 464(param) 466
-             467:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 458(param) 462(param) 464(param)
-             468:   18(fvec3)   Load 254(force)
-             469:   18(fvec3)   FAdd 468 467
-                                Store 254(force) 469
-                                Branch 448
-             448:             Label
-             470:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             471:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 472 472 16 16
-             473:    145(ptr) AccessChain 60(id) 16
-             474:     11(int) Load 473
-             475:    154(ptr) AccessChain 124 127 153 16
-             476:     88(int) Load 475
-             477:     88(int) ISub 476 244
-             478:     11(int) Bitcast 477
-             479:   172(bool) ULessThan 474 478
-             480:    145(ptr) AccessChain 60(id) 38
-             481:     11(int) Load 480
-             482:    154(ptr) AccessChain 124 127 153 38
-             483:     88(int) Load 482
-             484:     88(int) ISub 483 244
-             485:     11(int) Bitcast 484
-             486:   172(bool) ULessThan 481 485
-             487:   172(bool) LogicalAnd 479 486
-                              SelectionMerge 489 None
-                              BranchConditional 487 488 489
-             488:               Label
-             490:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             491:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 492 492 16 16
-             493:     11(int)   Load 147(index)
-             494:    154(ptr)   AccessChain 124 127 153 16
-             495:     88(int)   Load 494
-             496:     11(int)   Bitcast 495
-             497:     11(int)   IAdd 493 496
-             498:     11(int)   IAdd 497 38
-             500:    236(ptr)   AccessChain 210(particleIn) 127 498 127
-             501:   86(fvec4)   Load 500
-             502:   18(fvec3)   VectorShuffle 501 501 0 1 2
-                                Store 499(param) 502
-             504:   18(fvec3)   Load 267(pos)
-                                Store 503(param) 504
-             506:    129(ptr)   AccessChain 124 127 424
-             507:    8(float)   Load 506
-                                Store 505(param) 507
-             508:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 499(param) 503(param) 505(param)
-             509:   18(fvec3)   Load 254(force)
-             510:   18(fvec3)   FAdd 509 508
-                                Store 254(force) 510
-                                Branch 489
-             489:             Label
-             511:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             512:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 513 513 16 16
-             514:    145(ptr) AccessChain 60(id) 16
-             515:     11(int) Load 514
-             516:    154(ptr) AccessChain 124 127 153 16
-             517:     88(int) Load 516
-             518:     88(int) ISub 517 244
-             519:     11(int) Bitcast 518
-             520:   172(bool) ULessThan 515 519
-             521:    145(ptr) AccessChain 60(id) 38
-             522:     11(int) Load 521
-             523:   172(bool) UGreaterThan 522 16
-             524:   172(bool) LogicalAnd 520 523
-                              SelectionMerge 526 None
-                              BranchConditional 524 525 526
-             525:               Label
-             527:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             528:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 529 529 16 16
-             530:     11(int)   Load 147(index)
-             531:    154(ptr)   AccessChain 124 127 153 16
-             532:     88(int)   Load 531
-             533:     11(int)   Bitcast 532
-             534:     11(int)   ISub 530 533
-             535:     11(int)   IAdd 534 38
-             537:    236(ptr)   AccessChain 210(particleIn) 127 535 127
-             538:   86(fvec4)   Load 537
-             539:   18(fvec3)   VectorShuffle 538 538 0 1 2
-                                Store 536(param) 539
-             541:   18(fvec3)   Load 267(pos)
-                                Store 540(param) 541
-             543:    129(ptr)   AccessChain 124 127 424
-             544:    8(float)   Load 543
-                                Store 542(param) 544
-             545:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 536(param) 540(param) 542(param)
-             546:   18(fvec3)   Load 254(force)
-             547:   18(fvec3)   FAdd 546 545
-                                Store 254(force) 547
-                                Branch 526
-             526:             Label
-             548:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             549:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 550 550 16 16
-             552:    129(ptr) AccessChain 124 127 551
-             553:    8(float) Load 552
-             554:    8(float) FNegate 553
-             555:   18(fvec3) Load 277(vel)
-             556:   18(fvec3) VectorTimesScalar 555 554
-             557:   18(fvec3) Load 254(force)
-             558:   18(fvec3) FAdd 557 556
-                              Store 254(force) 558
-             559:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 560 560 16 16
-             564:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 562 561(f) 46
-             565:   18(fvec3) Load 254(force)
-             566:    129(ptr) AccessChain 124 127 244
-             567:    8(float) Load 566
-             568:    8(float) FDiv 216 567
-             569:   18(fvec3) VectorTimesScalar 565 568
-                              Store 561(f) 569
-             570:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 571 571 16 16
-             572:     11(int) Load 147(index)
-             573:   18(fvec3) Load 267(pos)
-             574:   18(fvec3) Load 277(vel)
-             575:    129(ptr) AccessChain 124 127 127
-             576:    8(float) Load 575
-             577:   18(fvec3) VectorTimesScalar 574 576
-             578:   18(fvec3) FAdd 573 577
-             580:   18(fvec3) Load 561(f)
-             581:   18(fvec3) VectorTimesScalar 580 579
-             582:    129(ptr) AccessChain 124 127 127
-             583:    8(float) Load 582
-             584:   18(fvec3) VectorTimesScalar 581 583
-             585:    129(ptr) AccessChain 124 127 127
-             586:    8(float) Load 585
-             587:   18(fvec3) VectorTimesScalar 584 586
-             588:   18(fvec3) FAdd 578 587
-             589:    8(float) CompositeExtract 588 0
-             590:    8(float) CompositeExtract 588 1
-             591:    8(float) CompositeExtract 588 2
-             592:   86(fvec4) CompositeConstruct 589 590 591 216
-             593:    236(ptr) AccessChain 232(particleOut) 127 572 127
-                              Store 593 592
-             594:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 595 595 16 16
-             596:     11(int) Load 147(index)
-             597:   18(fvec3) Load 277(vel)
-             598:   18(fvec3) Load 561(f)
-             599:    129(ptr) AccessChain 124 127 127
-             600:    8(float) Load 599
-             601:   18(fvec3) VectorTimesScalar 598 600
-             602:   18(fvec3) FAdd 597 601
-             603:    8(float) CompositeExtract 602 0
-             604:    8(float) CompositeExtract 602 1
-             605:    8(float) CompositeExtract 602 2
-             606:   86(fvec4) CompositeConstruct 603 604 605 245
-             607:    236(ptr) AccessChain 232(particleOut) 127 596 244
-                              Store 607 606
-             608:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 609 609 16 16
-             613:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 611 610(sphereDist) 46
-             614:     11(int) Load 147(index)
-             615:    236(ptr) AccessChain 232(particleOut) 127 614 127
-             616:   86(fvec4) Load 615
-             617:   18(fvec3) VectorShuffle 616 616 0 1 2
-             619:    236(ptr) AccessChain 124 127 618
-             620:   86(fvec4) Load 619
-             621:   18(fvec3) VectorShuffle 620 620 0 1 2
-             622:   18(fvec3) FSub 617 621
-                              Store 610(sphereDist) 622
-             623:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 624 624 16 16
-             625:   18(fvec3) Load 610(sphereDist)
-             626:    8(float) ExtInst 3(GLSL.std.450) 66(Length) 625
-             628:    129(ptr) AccessChain 124 127 627
-             629:    8(float) Load 628
-             631:    8(float) FAdd 629 630
-             632:   172(bool) FOrdLessThan 626 631
-                              SelectionMerge 634 None
-                              BranchConditional 632 633 634
-             633:               Label
-             635:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             636:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 637 637 16 16
-             638:     11(int)   Load 147(index)
-             639:    236(ptr)   AccessChain 124 127 618
-             640:   86(fvec4)   Load 639
-             641:   18(fvec3)   VectorShuffle 640 640 0 1 2
-             642:   18(fvec3)   Load 610(sphereDist)
-             643:   18(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 642
-             644:    129(ptr)   AccessChain 124 127 627
-             645:    8(float)   Load 644
-             646:    8(float)   FAdd 645 630
-             647:   18(fvec3)   VectorTimesScalar 643 646
-             648:   18(fvec3)   FAdd 641 647
-             649:    129(ptr)   AccessChain 232(particleOut) 127 638 127 16
-             650:    8(float)   CompositeExtract 648 0
-                                Store 649 650
-             651:    129(ptr)   AccessChain 232(particleOut) 127 638 127 38
-             652:    8(float)   CompositeExtract 648 1
-                                Store 651 652
-             653:    129(ptr)   AccessChain 232(particleOut) 127 638 127 49
-             654:    8(float)   CompositeExtract 648 2
-                                Store 653 654
-             655:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 656 656 16 16
-             657:     11(int)   Load 147(index)
-             658:    236(ptr)   AccessChain 232(particleOut) 127 657 244
-                                Store 658 246
-                                Branch 634
-             634:             Label
-             659:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             660:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 661 661 16 16
-             681:    679(ptr) AccessChain 677 127 127
-             682:     11(int) Load 681
-             683:   172(bool) IEqual 682 38
-                              SelectionMerge 685 None
-                              BranchConditional 683 684 685
-             684:               Label
-             686:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             687:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 688 688 16 16
-             691:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 690 689(normal) 46
-                                Store 689(normal) 692
-             693:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 694 694 16 16
-             695:    145(ptr)   AccessChain 60(id) 38
-             696:     11(int)   Load 695
-             697:   172(bool)   UGreaterThan 696 16
-                                SelectionMerge 699 None
-                                BranchConditional 697 698 699
-             698:                 Label
-             700:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             701:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 702 702 16 16
-             703:    145(ptr)     AccessChain 60(id) 16
-             704:     11(int)     Load 703
-             705:   172(bool)     UGreaterThan 704 16
-                                  SelectionMerge 707 None
-                                  BranchConditional 705 706 707
-             706:                   Label
-             708:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             709:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 710 710 16 16
-             714:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 712 711(a) 46
-             715:     11(int)       Load 147(index)
-             716:     11(int)       ISub 715 38
-             717:    236(ptr)       AccessChain 210(particleIn) 127 716 127
-             718:   86(fvec4)       Load 717
-             719:   18(fvec3)       VectorShuffle 718 718 0 1 2
-             720:   18(fvec3)       Load 267(pos)
-             721:   18(fvec3)       FSub 719 720
-                                    Store 711(a) 721
-             722:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 723 723 16 16
-             727:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 725 724(b) 46
-             728:     11(int)       Load 147(index)
-             729:    154(ptr)       AccessChain 124 127 153 16
-             730:     88(int)       Load 729
-             731:     11(int)       Bitcast 730
-             732:     11(int)       ISub 728 731
-             733:     11(int)       ISub 732 38
-             734:    236(ptr)       AccessChain 210(particleIn) 127 733 127
-             735:   86(fvec4)       Load 734
-             736:   18(fvec3)       VectorShuffle 735 735 0 1 2
-             737:   18(fvec3)       Load 267(pos)
-             738:   18(fvec3)       FSub 736 737
-                                    Store 724(b) 738
-             739:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 740 740 16 16
-             744:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 742 741(c) 46
-             745:     11(int)       Load 147(index)
-             746:    154(ptr)       AccessChain 124 127 153 16
-             747:     88(int)       Load 746
-             748:     11(int)       Bitcast 747
-             749:     11(int)       ISub 745 748
-             750:    236(ptr)       AccessChain 210(particleIn) 127 749 127
-             751:   86(fvec4)       Load 750
-             752:   18(fvec3)       VectorShuffle 751 751 0 1 2
-             753:   18(fvec3)       Load 267(pos)
-             754:   18(fvec3)       FSub 752 753
-                                    Store 741(c) 754
-             755:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 756 756 16 16
-             757:   18(fvec3)       Load 711(a)
-             758:   18(fvec3)       Load 724(b)
-             759:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 757 758
-             760:   18(fvec3)       Load 724(b)
-             761:   18(fvec3)       Load 741(c)
-             762:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 760 761
-             763:   18(fvec3)       FAdd 759 762
-             764:   18(fvec3)       Load 689(normal)
-             765:   18(fvec3)       FAdd 764 763
-                                    Store 689(normal) 765
-                                    Branch 707
-             707:                 Label
-             766:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             767:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 768 768 16 16
-             769:    145(ptr)     AccessChain 60(id) 16
-             770:     11(int)     Load 769
-             771:    154(ptr)     AccessChain 124 127 153 16
-             772:     88(int)     Load 771
-             773:     88(int)     ISub 772 244
-             774:     11(int)     Bitcast 773
-             775:   172(bool)     ULessThan 770 774
-                                  SelectionMerge 777 None
-                                  BranchConditional 775 776 777
-             776:                   Label
-             778:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             779:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 780 780 16 16
-             781:     11(int)       Load 147(index)
-             782:    154(ptr)       AccessChain 124 127 153 16
-             783:     88(int)       Load 782
-             784:     11(int)       Bitcast 783
-             785:     11(int)       ISub 781 784
-             786:    236(ptr)       AccessChain 210(particleIn) 127 785 127
-             787:   86(fvec4)       Load 786
-             788:   18(fvec3)       VectorShuffle 787 787 0 1 2
-             789:   18(fvec3)       Load 267(pos)
-             790:   18(fvec3)       FSub 788 789
-                                    Store 711(a) 790
-             791:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 792 792 16 16
-             793:     11(int)       Load 147(index)
-             794:    154(ptr)       AccessChain 124 127 153 16
-             795:     88(int)       Load 794
-             796:     11(int)       Bitcast 795
-             797:     11(int)       ISub 793 796
-             798:     11(int)       IAdd 797 38
-             799:    236(ptr)       AccessChain 210(particleIn) 127 798 127
-             800:   86(fvec4)       Load 799
-             801:   18(fvec3)       VectorShuffle 800 800 0 1 2
-             802:   18(fvec3)       Load 267(pos)
-             803:   18(fvec3)       FSub 801 802
-                                    Store 724(b) 803
-             804:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 805 805 16 16
-             806:     11(int)       Load 147(index)
-             807:     11(int)       IAdd 806 38
-             808:    236(ptr)       AccessChain 210(particleIn) 127 807 127
-             809:   86(fvec4)       Load 808
-             810:   18(fvec3)       VectorShuffle 809 809 0 1 2
-             811:   18(fvec3)       Load 267(pos)
-             812:   18(fvec3)       FSub 810 811
-                                    Store 741(c) 812
-             813:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 814 814 16 16
-             815:   18(fvec3)       Load 711(a)
-             816:   18(fvec3)       Load 724(b)
-             817:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 815 816
-             818:   18(fvec3)       Load 724(b)
-             819:   18(fvec3)       Load 741(c)
-             820:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 818 819
-             821:   18(fvec3)       FAdd 817 820
-             822:   18(fvec3)       Load 689(normal)
-             823:   18(fvec3)       FAdd 822 821
-                                    Store 689(normal) 823
-                                    Branch 777
-             777:                 Label
-                                  Branch 699
-             699:               Label
-             824:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             825:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 826 826 16 16
-             827:    145(ptr)   AccessChain 60(id) 38
-             828:     11(int)   Load 827
-             829:    154(ptr)   AccessChain 124 127 153 38
-             830:     88(int)   Load 829
-             831:     88(int)   ISub 830 244
-             832:     11(int)   Bitcast 831
-             833:   172(bool)   ULessThan 828 832
-                                SelectionMerge 835 None
-                                BranchConditional 833 834 835
-             834:                 Label
-             836:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             837:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 838 838 16 16
-             839:    145(ptr)     AccessChain 60(id) 16
-             840:     11(int)     Load 839
-             841:   172(bool)     UGreaterThan 840 16
-                                  SelectionMerge 843 None
-                                  BranchConditional 841 842 843
-             842:                   Label
-             844:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             845:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 846 846 16 16
-             847:     11(int)       Load 147(index)
-             848:    154(ptr)       AccessChain 124 127 153 16
-             849:     88(int)       Load 848
-             850:     11(int)       Bitcast 849
-             851:     11(int)       IAdd 847 850
-             852:    236(ptr)       AccessChain 210(particleIn) 127 851 127
-             853:   86(fvec4)       Load 852
-             854:   18(fvec3)       VectorShuffle 853 853 0 1 2
-             855:   18(fvec3)       Load 267(pos)
-             856:   18(fvec3)       FSub 854 855
-                                    Store 711(a) 856
-             857:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 858 858 16 16
-             859:     11(int)       Load 147(index)
-             860:    154(ptr)       AccessChain 124 127 153 16
-             861:     88(int)       Load 860
-             862:     11(int)       Bitcast 861
-             863:     11(int)       IAdd 859 862
-             864:     11(int)       ISub 863 38
-             865:    236(ptr)       AccessChain 210(particleIn) 127 864 127
-             866:   86(fvec4)       Load 865
-             867:   18(fvec3)       VectorShuffle 866 866 0 1 2
-             868:   18(fvec3)       Load 267(pos)
-             869:   18(fvec3)       FSub 867 868
-                                    Store 724(b) 869
-             870:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 871 871 16 16
-             872:     11(int)       Load 147(index)
-             873:     11(int)       ISub 872 38
-             874:    236(ptr)       AccessChain 210(particleIn) 127 873 127
-             875:   86(fvec4)       Load 874
-             876:   18(fvec3)       VectorShuffle 875 875 0 1 2
-             877:   18(fvec3)       Load 267(pos)
-             878:   18(fvec3)       FSub 876 877
-                                    Store 741(c) 878
-             879:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 880 880 16 16
-             881:   18(fvec3)       Load 711(a)
-             882:   18(fvec3)       Load 724(b)
-             883:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 881 882
-             884:   18(fvec3)       Load 724(b)
-             885:   18(fvec3)       Load 741(c)
-             886:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 884 885
-             887:   18(fvec3)       FAdd 883 886
-             888:   18(fvec3)       Load 689(normal)
-             889:   18(fvec3)       FAdd 888 887
-                                    Store 689(normal) 889
-                                    Branch 843
-             843:                 Label
-             890:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             891:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 892 892 16 16
-             893:    145(ptr)     AccessChain 60(id) 16
-             894:     11(int)     Load 893
-             895:    154(ptr)     AccessChain 124 127 153 16
-             896:     88(int)     Load 895
-             897:     88(int)     ISub 896 244
-             898:     11(int)     Bitcast 897
-             899:   172(bool)     ULessThan 894 898
-                                  SelectionMerge 901 None
-                                  BranchConditional 899 900 901
-             900:                   Label
-             902:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             903:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 904 904 16 16
-             905:     11(int)       Load 147(index)
-             906:     11(int)       IAdd 905 38
-             907:    236(ptr)       AccessChain 210(particleIn) 127 906 127
-             908:   86(fvec4)       Load 907
-             909:   18(fvec3)       VectorShuffle 908 908 0 1 2
-             910:   18(fvec3)       Load 267(pos)
-             911:   18(fvec3)       FSub 909 910
-                                    Store 711(a) 911
-             912:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 913 913 16 16
-             914:     11(int)       Load 147(index)
-             915:    154(ptr)       AccessChain 124 127 153 16
-             916:     88(int)       Load 915
-             917:     11(int)       Bitcast 916
-             918:     11(int)       IAdd 914 917
-             919:     11(int)       IAdd 918 38
-             920:    236(ptr)       AccessChain 210(particleIn) 127 919 127
-             921:   86(fvec4)       Load 920
-             922:   18(fvec3)       VectorShuffle 921 921 0 1 2
-             923:   18(fvec3)       Load 267(pos)
-             924:   18(fvec3)       FSub 922 923
-                                    Store 724(b) 924
-             925:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 926 926 16 16
-             927:     11(int)       Load 147(index)
-             928:    154(ptr)       AccessChain 124 127 153 16
-             929:     88(int)       Load 928
-             930:     11(int)       Bitcast 929
-             931:     11(int)       IAdd 927 930
-             932:    236(ptr)       AccessChain 210(particleIn) 127 931 127
-             933:   86(fvec4)       Load 932
-             934:   18(fvec3)       VectorShuffle 933 933 0 1 2
-             935:   18(fvec3)       Load 267(pos)
-             936:   18(fvec3)       FSub 934 935
-                                    Store 741(c) 936
-             937:           4       ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 938 938 16 16
-             939:   18(fvec3)       Load 711(a)
-             940:   18(fvec3)       Load 724(b)
-             941:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 939 940
-             942:   18(fvec3)       Load 724(b)
-             943:   18(fvec3)       Load 741(c)
-             944:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 942 943
-             945:   18(fvec3)       FAdd 941 944
-             946:   18(fvec3)       Load 689(normal)
-             947:   18(fvec3)       FAdd 946 945
-                                    Store 689(normal) 947
-                                    Branch 901
-             901:                 Label
-                                  Branch 835
-             835:               Label
-             948:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
-             949:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 950 950 16 16
-             951:     11(int)   Load 147(index)
-             952:   18(fvec3)   Load 689(normal)
-             953:   18(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 952
-             954:    8(float)   CompositeExtract 953 0
-             955:    8(float)   CompositeExtract 953 1
-             956:    8(float)   CompositeExtract 953 2
-             957:   86(fvec4)   CompositeConstruct 954 955 956 245
-             958:    236(ptr)   AccessChain 232(particleOut) 127 951 551
-                                Store 958 957
-                                Branch 685
-             685:             Label
+             257:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             258:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 255 255 16 16
+             256:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 253 252(force) 44
+             260:    236(ptr) AccessChain 122 125 259
+             261:   84(fvec4) Load 260
+             262:   18(fvec3) VectorShuffle 261 261 0 1 2
+             263:    127(ptr) AccessChain 122 125 244
+             264:    8(float) Load 263
+             265:   18(fvec3) VectorTimesScalar 262 264
+                              Store 252(force) 265
+             271:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 269 269 16 16
+             270:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 267 266(pos) 44
+             272:     11(int) Load 144(index)
+             273:    236(ptr) AccessChain 208(particleIn) 125 272 125
+             274:   84(fvec4) Load 273
+             275:   18(fvec3) VectorShuffle 274 274 0 1 2
+                              Store 266(pos) 275
+             281:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 279 279 16 16
+             280:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 277 276(vel) 44
+             282:     11(int) Load 144(index)
+             283:    236(ptr) AccessChain 208(particleIn) 125 282 244
+             284:   84(fvec4) Load 283
+             285:   18(fvec3) VectorShuffle 284 284 0 1 2
+                              Store 276(vel) 285
+             287:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 288 288 16 16
+             286:    142(ptr) AccessChain 60(id) 16
+             289:     11(int) Load 286
+             290:   171(bool) UGreaterThan 289 16
+                              SelectionMerge 292 None
+                              BranchConditional 290 291 292
+             291:               Label
+             294:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             295:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 296 296 16 16
+             293:     11(int)   Load 144(index)
+             297:     11(int)   ISub 293 38
+             299:    236(ptr)   AccessChain 208(particleIn) 125 297 125
+             300:   84(fvec4)   Load 299
+             301:   18(fvec3)   VectorShuffle 300 300 0 1 2
+                                Store 298(param) 301
+             303:   18(fvec3)   Load 266(pos)
+                                Store 302(param) 303
+             305:    127(ptr)   AccessChain 122 125 213
+             306:    8(float)   Load 305
+                                Store 304(param) 306
+             307:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 298(param) 302(param) 304(param)
+             308:   18(fvec3)   Load 252(force)
+             309:   18(fvec3)   FAdd 308 307
+                                Store 252(force) 309
+                                Branch 292
+             292:             Label
+             311:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             312:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 313 313 16 16
+             310:    142(ptr) AccessChain 60(id) 16
+             314:     11(int) Load 310
+             315:    153(ptr) AccessChain 122 125 152 16
+             316:     86(int) Load 315
+             317:     86(int) ISub 316 244
+             318:     11(int) Bitcast 317
+             319:   171(bool) ULessThan 314 318
+                              SelectionMerge 321 None
+                              BranchConditional 319 320 321
+             320:               Label
+             323:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             324:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 325 325 16 16
+             322:     11(int)   Load 144(index)
+             326:     11(int)   IAdd 322 38
+             328:    236(ptr)   AccessChain 208(particleIn) 125 326 125
+             329:   84(fvec4)   Load 328
+             330:   18(fvec3)   VectorShuffle 329 329 0 1 2
+                                Store 327(param) 330
+             332:   18(fvec3)   Load 266(pos)
+                                Store 331(param) 332
+             334:    127(ptr)   AccessChain 122 125 213
+             335:    8(float)   Load 334
+                                Store 333(param) 335
+             336:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 327(param) 331(param) 333(param)
+             337:   18(fvec3)   Load 252(force)
+             338:   18(fvec3)   FAdd 337 336
+                                Store 252(force) 338
+                                Branch 321
+             321:             Label
+             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             341:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 342 342 16 16
+             339:    142(ptr) AccessChain 60(id) 38
+             343:     11(int) Load 339
+             344:    153(ptr) AccessChain 122 125 152 38
+             345:     86(int) Load 344
+             346:     86(int) ISub 345 244
+             347:     11(int) Bitcast 346
+             348:   171(bool) ULessThan 343 347
+                              SelectionMerge 350 None
+                              BranchConditional 348 349 350
+             349:               Label
+             352:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             353:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 354 354 16 16
+             351:     11(int)   Load 144(index)
+             355:    153(ptr)   AccessChain 122 125 152 16
+             356:     86(int)   Load 355
+             357:     11(int)   Bitcast 356
+             358:     11(int)   IAdd 351 357
+             361:    236(ptr)   AccessChain 208(particleIn) 125 358 125
+             362:   84(fvec4)   Load 361
+             363:   18(fvec3)   VectorShuffle 362 362 0 1 2
+                                Store 360(param) 363
+             365:   18(fvec3)   Load 266(pos)
+                                Store 364(param) 365
+             367:    127(ptr)   AccessChain 122 125 359
+             368:    8(float)   Load 367
+                                Store 366(param) 368
+             369:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 360(param) 364(param) 366(param)
+             370:   18(fvec3)   Load 252(force)
+             371:   18(fvec3)   FAdd 370 369
+                                Store 252(force) 371
+                                Branch 350
+             350:             Label
+             373:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             374:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 375 375 16 16
+             372:    142(ptr) AccessChain 60(id) 38
+             376:     11(int) Load 372
+             377:   171(bool) UGreaterThan 376 16
+                              SelectionMerge 379 None
+                              BranchConditional 377 378 379
+             378:               Label
+             381:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             382:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 383 383 16 16
+             380:     11(int)   Load 144(index)
+             384:    153(ptr)   AccessChain 122 125 152 16
+             385:     86(int)   Load 384
+             386:     11(int)   Bitcast 385
+             387:     11(int)   ISub 380 386
+             389:    236(ptr)   AccessChain 208(particleIn) 125 387 125
+             390:   84(fvec4)   Load 389
+             391:   18(fvec3)   VectorShuffle 390 390 0 1 2
+                                Store 388(param) 391
+             393:   18(fvec3)   Load 266(pos)
+                                Store 392(param) 393
+             395:    127(ptr)   AccessChain 122 125 359
+             396:    8(float)   Load 395
+                                Store 394(param) 396
+             397:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 388(param) 392(param) 394(param)
+             398:   18(fvec3)   Load 252(force)
+             399:   18(fvec3)   FAdd 398 397
+                                Store 252(force) 399
+                                Branch 379
+             379:             Label
+             401:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             402:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 403 403 16 16
+             400:    142(ptr) AccessChain 60(id) 16
+             404:     11(int) Load 400
+             405:   171(bool) UGreaterThan 404 16
+             406:    142(ptr) AccessChain 60(id) 38
+             407:     11(int) Load 406
+             408:    153(ptr) AccessChain 122 125 152 38
+             409:     86(int) Load 408
+             410:     86(int) ISub 409 244
+             411:     11(int) Bitcast 410
+             412:   171(bool) ULessThan 407 411
+             413:   171(bool) LogicalAnd 405 412
+                              SelectionMerge 415 None
+                              BranchConditional 413 414 415
+             414:               Label
+             417:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             418:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 419 419 16 16
+             416:     11(int)   Load 144(index)
+             420:    153(ptr)   AccessChain 122 125 152 16
+             421:     86(int)   Load 420
+             422:     11(int)   Bitcast 421
+             423:     11(int)   IAdd 416 422
+             424:     11(int)   ISub 423 38
+             427:    236(ptr)   AccessChain 208(particleIn) 125 424 125
+             428:   84(fvec4)   Load 427
+             429:   18(fvec3)   VectorShuffle 428 428 0 1 2
+                                Store 426(param) 429
+             431:   18(fvec3)   Load 266(pos)
+                                Store 430(param) 431
+             433:    127(ptr)   AccessChain 122 125 425
+             434:    8(float)   Load 433
+                                Store 432(param) 434
+             435:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 426(param) 430(param) 432(param)
+             436:   18(fvec3)   Load 252(force)
+             437:   18(fvec3)   FAdd 436 435
+                                Store 252(force) 437
+                                Branch 415
+             415:             Label
+             439:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             440:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 441 441 16 16
+             438:    142(ptr) AccessChain 60(id) 16
+             442:     11(int) Load 438
+             443:   171(bool) UGreaterThan 442 16
+             444:    142(ptr) AccessChain 60(id) 38
+             445:     11(int) Load 444
+             446:   171(bool) UGreaterThan 445 16
+             447:   171(bool) LogicalAnd 443 446
+                              SelectionMerge 449 None
+                              BranchConditional 447 448 449
+             448:               Label
+             451:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             452:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 453 453 16 16
+             450:     11(int)   Load 144(index)
+             454:    153(ptr)   AccessChain 122 125 152 16
+             455:     86(int)   Load 454
+             456:     11(int)   Bitcast 455
+             457:     11(int)   ISub 450 456
+             458:     11(int)   ISub 457 38
+             460:    236(ptr)   AccessChain 208(particleIn) 125 458 125
+             461:   84(fvec4)   Load 460
+             462:   18(fvec3)   VectorShuffle 461 461 0 1 2
+                                Store 459(param) 462
+             464:   18(fvec3)   Load 266(pos)
+                                Store 463(param) 464
+             466:    127(ptr)   AccessChain 122 125 425
+             467:    8(float)   Load 466
+                                Store 465(param) 467
+             468:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 459(param) 463(param) 465(param)
+             469:   18(fvec3)   Load 252(force)
+             470:   18(fvec3)   FAdd 469 468
+                                Store 252(force) 470
+                                Branch 449
+             449:             Label
+             472:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             473:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 474 474 16 16
+             471:    142(ptr) AccessChain 60(id) 16
+             475:     11(int) Load 471
+             476:    153(ptr) AccessChain 122 125 152 16
+             477:     86(int) Load 476
+             478:     86(int) ISub 477 244
+             479:     11(int) Bitcast 478
+             480:   171(bool) ULessThan 475 479
+             481:    142(ptr) AccessChain 60(id) 38
+             482:     11(int) Load 481
+             483:    153(ptr) AccessChain 122 125 152 38
+             484:     86(int) Load 483
+             485:     86(int) ISub 484 244
+             486:     11(int) Bitcast 485
+             487:   171(bool) ULessThan 482 486
+             488:   171(bool) LogicalAnd 480 487
+                              SelectionMerge 490 None
+                              BranchConditional 488 489 490
+             489:               Label
+             492:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             493:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 494 494 16 16
+             491:     11(int)   Load 144(index)
+             495:    153(ptr)   AccessChain 122 125 152 16
+             496:     86(int)   Load 495
+             497:     11(int)   Bitcast 496
+             498:     11(int)   IAdd 491 497
+             499:     11(int)   IAdd 498 38
+             501:    236(ptr)   AccessChain 208(particleIn) 125 499 125
+             502:   84(fvec4)   Load 501
+             503:   18(fvec3)   VectorShuffle 502 502 0 1 2
+                                Store 500(param) 503
+             505:   18(fvec3)   Load 266(pos)
+                                Store 504(param) 505
+             507:    127(ptr)   AccessChain 122 125 425
+             508:    8(float)   Load 507
+                                Store 506(param) 508
+             509:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 500(param) 504(param) 506(param)
+             510:   18(fvec3)   Load 252(force)
+             511:   18(fvec3)   FAdd 510 509
+                                Store 252(force) 511
+                                Branch 490
+             490:             Label
+             513:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             514:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 515 515 16 16
+             512:    142(ptr) AccessChain 60(id) 16
+             516:     11(int) Load 512
+             517:    153(ptr) AccessChain 122 125 152 16
+             518:     86(int) Load 517
+             519:     86(int) ISub 518 244
+             520:     11(int) Bitcast 519
+             521:   171(bool) ULessThan 516 520
+             522:    142(ptr) AccessChain 60(id) 38
+             523:     11(int) Load 522
+             524:   171(bool) UGreaterThan 523 16
+             525:   171(bool) LogicalAnd 521 524
+                              SelectionMerge 527 None
+                              BranchConditional 525 526 527
+             526:               Label
+             529:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             530:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 531 531 16 16
+             528:     11(int)   Load 144(index)
+             532:    153(ptr)   AccessChain 122 125 152 16
+             533:     86(int)   Load 532
+             534:     11(int)   Bitcast 533
+             535:     11(int)   ISub 528 534
+             536:     11(int)   IAdd 535 38
+             538:    236(ptr)   AccessChain 208(particleIn) 125 536 125
+             539:   84(fvec4)   Load 538
+             540:   18(fvec3)   VectorShuffle 539 539 0 1 2
+                                Store 537(param) 540
+             542:   18(fvec3)   Load 266(pos)
+                                Store 541(param) 542
+             544:    127(ptr)   AccessChain 122 125 425
+             545:    8(float)   Load 544
+                                Store 543(param) 545
+             546:   18(fvec3)   FunctionCall 30(springForce(vf3;vf3;f1;) 537(param) 541(param) 543(param)
+             547:   18(fvec3)   Load 252(force)
+             548:   18(fvec3)   FAdd 547 546
+                                Store 252(force) 548
+                                Branch 527
+             527:             Label
+             551:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             552:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 553 553 16 16
+             550:    127(ptr) AccessChain 122 125 549
+             554:    8(float) Load 550
+             555:    8(float) FNegate 554
+             556:   18(fvec3) Load 276(vel)
+             557:   18(fvec3) VectorTimesScalar 556 555
+             558:   18(fvec3) Load 252(force)
+             559:   18(fvec3) FAdd 558 557
+                              Store 252(force) 559
+             565:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 563 563 16 16
+             564:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 561 560(f) 44
+             566:   18(fvec3) Load 252(force)
+             567:    127(ptr) AccessChain 122 125 244
+             568:    8(float) Load 567
+             569:    8(float) FDiv 216 568
+             570:   18(fvec3) VectorTimesScalar 566 569
+                              Store 560(f) 570
+             572:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 573 573 16 16
+             571:     11(int) Load 144(index)
+             574:   18(fvec3) Load 266(pos)
+             575:   18(fvec3) Load 276(vel)
+             576:    127(ptr) AccessChain 122 125 125
+             577:    8(float) Load 576
+             578:   18(fvec3) VectorTimesScalar 575 577
+             579:   18(fvec3) FAdd 574 578
+             581:   18(fvec3) Load 560(f)
+             582:   18(fvec3) VectorTimesScalar 581 580
+             583:    127(ptr) AccessChain 122 125 125
+             584:    8(float) Load 583
+             585:   18(fvec3) VectorTimesScalar 582 584
+             586:    127(ptr) AccessChain 122 125 125
+             587:    8(float) Load 586
+             588:   18(fvec3) VectorTimesScalar 585 587
+             589:   18(fvec3) FAdd 579 588
+             590:    8(float) CompositeExtract 589 0
+             591:    8(float) CompositeExtract 589 1
+             592:    8(float) CompositeExtract 589 2
+             593:   84(fvec4) CompositeConstruct 590 591 592 216
+             594:    236(ptr) AccessChain 230(particleOut) 125 571 125
+                              Store 594 593
+             596:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 597 597 16 16
+             595:     11(int) Load 144(index)
+             598:   18(fvec3) Load 276(vel)
+             599:   18(fvec3) Load 560(f)
+             600:    127(ptr) AccessChain 122 125 125
+             601:    8(float) Load 600
+             602:   18(fvec3) VectorTimesScalar 599 601
+             603:   18(fvec3) FAdd 598 602
+             604:    8(float) CompositeExtract 603 0
+             605:    8(float) CompositeExtract 603 1
+             606:    8(float) CompositeExtract 603 2
+             607:   84(fvec4) CompositeConstruct 604 605 606 245
+             608:    236(ptr) AccessChain 230(particleOut) 125 595 244
+                              Store 608 607
+             614:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 612 612 16 16
+             613:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 610 609(sphereDist) 44
+             615:     11(int) Load 144(index)
+             616:    236(ptr) AccessChain 230(particleOut) 125 615 125
+             617:   84(fvec4) Load 616
+             618:   18(fvec3) VectorShuffle 617 617 0 1 2
+             620:    236(ptr) AccessChain 122 125 619
+             621:   84(fvec4) Load 620
+             622:   18(fvec3) VectorShuffle 621 621 0 1 2
+             623:   18(fvec3) FSub 618 622
+                              Store 609(sphereDist) 623
+             625:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 626 626 16 16
+             624:   18(fvec3) Load 609(sphereDist)
+             627:    8(float) ExtInst 3(GLSL.std.450) 66(Length) 624
+             629:    127(ptr) AccessChain 122 125 628
+             630:    8(float) Load 629
+             632:    8(float) FAdd 630 631
+             633:   171(bool) FOrdLessThan 627 632
+                              SelectionMerge 635 None
+                              BranchConditional 633 634 635
+             634:               Label
+             637:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             638:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 639 639 16 16
+             636:     11(int)   Load 144(index)
+             640:    236(ptr)   AccessChain 122 125 619
+             641:   84(fvec4)   Load 640
+             642:   18(fvec3)   VectorShuffle 641 641 0 1 2
+             643:   18(fvec3)   Load 609(sphereDist)
+             644:   18(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 643
+             645:    127(ptr)   AccessChain 122 125 628
+             646:    8(float)   Load 645
+             647:    8(float)   FAdd 646 631
+             648:   18(fvec3)   VectorTimesScalar 644 647
+             649:   18(fvec3)   FAdd 642 648
+             650:    127(ptr)   AccessChain 230(particleOut) 125 636 125 16
+             651:    8(float)   CompositeExtract 649 0
+                                Store 650 651
+             652:    127(ptr)   AccessChain 230(particleOut) 125 636 125 38
+             653:    8(float)   CompositeExtract 649 1
+                                Store 652 653
+             654:    127(ptr)   AccessChain 230(particleOut) 125 636 125 49
+             655:    8(float)   CompositeExtract 649 2
+                                Store 654 655
+             657:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 658 658 16 16
+             656:     11(int)   Load 144(index)
+             659:    236(ptr)   AccessChain 230(particleOut) 125 656 244
+                                Store 659 246
+                                Branch 635
+             635:             Label
+             681:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             682:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 667 667 16 16
+             680:    678(ptr) AccessChain 676 125 125
+             683:     11(int) Load 680
+             684:   171(bool) IEqual 683 38
+                              SelectionMerge 686 None
+                              BranchConditional 684 685 686
+             685:               Label
+             691:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             692:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 689 689 16 16
+             690:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 688 687(normal) 44
+                                Store 687(normal) 693
+             695:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 696 696 16 16
+             694:    142(ptr)   AccessChain 60(id) 38
+             697:     11(int)   Load 694
+             698:   171(bool)   UGreaterThan 697 16
+                                SelectionMerge 700 None
+                                BranchConditional 698 699 700
+             699:                 Label
+             702:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             703:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 704 704 16 16
+             701:    142(ptr)     AccessChain 60(id) 16
+             705:     11(int)     Load 701
+             706:   171(bool)     UGreaterThan 705 16
+                                  SelectionMerge 708 None
+                                  BranchConditional 706 707 708
+             707:                   Label
+             714:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             715:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 712 712 16 16
+             713:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 710 709(a) 44
+             716:     11(int)       Load 144(index)
+             717:     11(int)       ISub 716 38
+             718:    236(ptr)       AccessChain 208(particleIn) 125 717 125
+             719:   84(fvec4)       Load 718
+             720:   18(fvec3)       VectorShuffle 719 719 0 1 2
+             721:   18(fvec3)       Load 266(pos)
+             722:   18(fvec3)       FSub 720 721
+                                    Store 709(a) 722
+             728:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 726 726 16 16
+             727:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 724 723(b) 44
+             729:     11(int)       Load 144(index)
+             730:    153(ptr)       AccessChain 122 125 152 16
+             731:     86(int)       Load 730
+             732:     11(int)       Bitcast 731
+             733:     11(int)       ISub 729 732
+             734:     11(int)       ISub 733 38
+             735:    236(ptr)       AccessChain 208(particleIn) 125 734 125
+             736:   84(fvec4)       Load 735
+             737:   18(fvec3)       VectorShuffle 736 736 0 1 2
+             738:   18(fvec3)       Load 266(pos)
+             739:   18(fvec3)       FSub 737 738
+                                    Store 723(b) 739
+             745:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 743 743 16 16
+             744:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 741 740(c) 44
+             746:     11(int)       Load 144(index)
+             747:    153(ptr)       AccessChain 122 125 152 16
+             748:     86(int)       Load 747
+             749:     11(int)       Bitcast 748
+             750:     11(int)       ISub 746 749
+             751:    236(ptr)       AccessChain 208(particleIn) 125 750 125
+             752:   84(fvec4)       Load 751
+             753:   18(fvec3)       VectorShuffle 752 752 0 1 2
+             754:   18(fvec3)       Load 266(pos)
+             755:   18(fvec3)       FSub 753 754
+                                    Store 740(c) 755
+             757:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 758 758 16 16
+             756:   18(fvec3)       Load 709(a)
+             759:   18(fvec3)       Load 723(b)
+             760:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 756 759
+             761:   18(fvec3)       Load 723(b)
+             762:   18(fvec3)       Load 740(c)
+             763:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 761 762
+             764:   18(fvec3)       FAdd 760 763
+             765:   18(fvec3)       Load 687(normal)
+             766:   18(fvec3)       FAdd 765 764
+                                    Store 687(normal) 766
+                                    Branch 708
+             708:                 Label
+             768:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             769:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 770 770 16 16
+             767:    142(ptr)     AccessChain 60(id) 16
+             771:     11(int)     Load 767
+             772:    153(ptr)     AccessChain 122 125 152 16
+             773:     86(int)     Load 772
+             774:     86(int)     ISub 773 244
+             775:     11(int)     Bitcast 774
+             776:   171(bool)     ULessThan 771 775
+                                  SelectionMerge 778 None
+                                  BranchConditional 776 777 778
+             777:                   Label
+             780:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             781:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 782 782 16 16
+             779:     11(int)       Load 144(index)
+             783:    153(ptr)       AccessChain 122 125 152 16
+             784:     86(int)       Load 783
+             785:     11(int)       Bitcast 784
+             786:     11(int)       ISub 779 785
+             787:    236(ptr)       AccessChain 208(particleIn) 125 786 125
+             788:   84(fvec4)       Load 787
+             789:   18(fvec3)       VectorShuffle 788 788 0 1 2
+             790:   18(fvec3)       Load 266(pos)
+             791:   18(fvec3)       FSub 789 790
+                                    Store 709(a) 791
+             793:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 794 794 16 16
+             792:     11(int)       Load 144(index)
+             795:    153(ptr)       AccessChain 122 125 152 16
+             796:     86(int)       Load 795
+             797:     11(int)       Bitcast 796
+             798:     11(int)       ISub 792 797
+             799:     11(int)       IAdd 798 38
+             800:    236(ptr)       AccessChain 208(particleIn) 125 799 125
+             801:   84(fvec4)       Load 800
+             802:   18(fvec3)       VectorShuffle 801 801 0 1 2
+             803:   18(fvec3)       Load 266(pos)
+             804:   18(fvec3)       FSub 802 803
+                                    Store 723(b) 804
+             806:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 807 807 16 16
+             805:     11(int)       Load 144(index)
+             808:     11(int)       IAdd 805 38
+             809:    236(ptr)       AccessChain 208(particleIn) 125 808 125
+             810:   84(fvec4)       Load 809
+             811:   18(fvec3)       VectorShuffle 810 810 0 1 2
+             812:   18(fvec3)       Load 266(pos)
+             813:   18(fvec3)       FSub 811 812
+                                    Store 740(c) 813
+             815:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 816 816 16 16
+             814:   18(fvec3)       Load 709(a)
+             817:   18(fvec3)       Load 723(b)
+             818:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 814 817
+             819:   18(fvec3)       Load 723(b)
+             820:   18(fvec3)       Load 740(c)
+             821:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 819 820
+             822:   18(fvec3)       FAdd 818 821
+             823:   18(fvec3)       Load 687(normal)
+             824:   18(fvec3)       FAdd 823 822
+                                    Store 687(normal) 824
+                                    Branch 778
+             778:                 Label
+             825:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+                                  Branch 700
+             700:               Label
+             827:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             828:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 829 829 16 16
+             826:    142(ptr)   AccessChain 60(id) 38
+             830:     11(int)   Load 826
+             831:    153(ptr)   AccessChain 122 125 152 38
+             832:     86(int)   Load 831
+             833:     86(int)   ISub 832 244
+             834:     11(int)   Bitcast 833
+             835:   171(bool)   ULessThan 830 834
+                                SelectionMerge 837 None
+                                BranchConditional 835 836 837
+             836:                 Label
+             839:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             840:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 841 841 16 16
+             838:    142(ptr)     AccessChain 60(id) 16
+             842:     11(int)     Load 838
+             843:   171(bool)     UGreaterThan 842 16
+                                  SelectionMerge 845 None
+                                  BranchConditional 843 844 845
+             844:                   Label
+             847:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             848:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 849 849 16 16
+             846:     11(int)       Load 144(index)
+             850:    153(ptr)       AccessChain 122 125 152 16
+             851:     86(int)       Load 850
+             852:     11(int)       Bitcast 851
+             853:     11(int)       IAdd 846 852
+             854:    236(ptr)       AccessChain 208(particleIn) 125 853 125
+             855:   84(fvec4)       Load 854
+             856:   18(fvec3)       VectorShuffle 855 855 0 1 2
+             857:   18(fvec3)       Load 266(pos)
+             858:   18(fvec3)       FSub 856 857
+                                    Store 709(a) 858
+             860:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 861 861 16 16
+             859:     11(int)       Load 144(index)
+             862:    153(ptr)       AccessChain 122 125 152 16
+             863:     86(int)       Load 862
+             864:     11(int)       Bitcast 863
+             865:     11(int)       IAdd 859 864
+             866:     11(int)       ISub 865 38
+             867:    236(ptr)       AccessChain 208(particleIn) 125 866 125
+             868:   84(fvec4)       Load 867
+             869:   18(fvec3)       VectorShuffle 868 868 0 1 2
+             870:   18(fvec3)       Load 266(pos)
+             871:   18(fvec3)       FSub 869 870
+                                    Store 723(b) 871
+             873:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 874 874 16 16
+             872:     11(int)       Load 144(index)
+             875:     11(int)       ISub 872 38
+             876:    236(ptr)       AccessChain 208(particleIn) 125 875 125
+             877:   84(fvec4)       Load 876
+             878:   18(fvec3)       VectorShuffle 877 877 0 1 2
+             879:   18(fvec3)       Load 266(pos)
+             880:   18(fvec3)       FSub 878 879
+                                    Store 740(c) 880
+             882:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 883 883 16 16
+             881:   18(fvec3)       Load 709(a)
+             884:   18(fvec3)       Load 723(b)
+             885:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 881 884
+             886:   18(fvec3)       Load 723(b)
+             887:   18(fvec3)       Load 740(c)
+             888:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 886 887
+             889:   18(fvec3)       FAdd 885 888
+             890:   18(fvec3)       Load 687(normal)
+             891:   18(fvec3)       FAdd 890 889
+                                    Store 687(normal) 891
+                                    Branch 845
+             845:                 Label
+             893:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             894:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 895 895 16 16
+             892:    142(ptr)     AccessChain 60(id) 16
+             896:     11(int)     Load 892
+             897:    153(ptr)     AccessChain 122 125 152 16
+             898:     86(int)     Load 897
+             899:     86(int)     ISub 898 244
+             900:     11(int)     Bitcast 899
+             901:   171(bool)     ULessThan 896 900
+                                  SelectionMerge 903 None
+                                  BranchConditional 901 902 903
+             902:                   Label
+             905:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             906:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 907 907 16 16
+             904:     11(int)       Load 144(index)
+             908:     11(int)       IAdd 904 38
+             909:    236(ptr)       AccessChain 208(particleIn) 125 908 125
+             910:   84(fvec4)       Load 909
+             911:   18(fvec3)       VectorShuffle 910 910 0 1 2
+             912:   18(fvec3)       Load 266(pos)
+             913:   18(fvec3)       FSub 911 912
+                                    Store 709(a) 913
+             915:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 916 916 16 16
+             914:     11(int)       Load 144(index)
+             917:    153(ptr)       AccessChain 122 125 152 16
+             918:     86(int)       Load 917
+             919:     11(int)       Bitcast 918
+             920:     11(int)       IAdd 914 919
+             921:     11(int)       IAdd 920 38
+             922:    236(ptr)       AccessChain 208(particleIn) 125 921 125
+             923:   84(fvec4)       Load 922
+             924:   18(fvec3)       VectorShuffle 923 923 0 1 2
+             925:   18(fvec3)       Load 266(pos)
+             926:   18(fvec3)       FSub 924 925
+                                    Store 723(b) 926
+             928:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 929 929 16 16
+             927:     11(int)       Load 144(index)
+             930:    153(ptr)       AccessChain 122 125 152 16
+             931:     86(int)       Load 930
+             932:     11(int)       Bitcast 931
+             933:     11(int)       IAdd 927 932
+             934:    236(ptr)       AccessChain 208(particleIn) 125 933 125
+             935:   84(fvec4)       Load 934
+             936:   18(fvec3)       VectorShuffle 935 935 0 1 2
+             937:   18(fvec3)       Load 266(pos)
+             938:   18(fvec3)       FSub 936 937
+                                    Store 740(c) 938
+             940:           4       ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 941 941 16 16
+             939:   18(fvec3)       Load 709(a)
+             942:   18(fvec3)       Load 723(b)
+             943:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 939 942
+             944:   18(fvec3)       Load 723(b)
+             945:   18(fvec3)       Load 740(c)
+             946:   18(fvec3)       ExtInst 3(GLSL.std.450) 68(Cross) 944 945
+             947:   18(fvec3)       FAdd 943 946
+             948:   18(fvec3)       Load 687(normal)
+             949:   18(fvec3)       FAdd 948 947
+                                    Store 687(normal) 949
+                                    Branch 903
+             903:                 Label
+             950:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+                                  Branch 837
+             837:               Label
+             952:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
+             953:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 34 954 954 16 16
+             951:     11(int)   Load 144(index)
+             955:   18(fvec3)   Load 687(normal)
+             956:   18(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 955
+             957:    8(float)   CompositeExtract 956 0
+             958:    8(float)   CompositeExtract 956 1
+             959:    8(float)   CompositeExtract 956 2
+             960:   84(fvec4)   CompositeConstruct 957 958 959 245
+             961:    236(ptr)   AccessChain 230(particleOut) 125 951 549
+                                Store 961 960
+                                Branch 686
+             686:             Label
+             962:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 64
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.frag.out b/Test/baseResults/spv.debuginfo.hlsl.frag.out
index b76a7d7b..29ebf408 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.frag.out
@@ -1,17 +1,17 @@
 spv.debuginfo.hlsl.frag
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 895
+// Id's are bound by 903
 
                               Capability Shader
                               Capability ImageQuery
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 6  "main" 888 891
+                              EntryPoint Fragment 6  "main" 896 899
                               ExecutionMode 6 OriginUpperLeft
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               38:             String  "textureProj"
@@ -24,42 +24,42 @@ spv.debuginfo.hlsl.frag
 // OpModuleProcessed hlsl-offsets
 #line 1
 "
-              49:             String  "P"
+              47:             String  "P"
               53:             String  "layer"
               56:             String  "offset"
               64:             String  "filterPCF"
-              70:             String  "sc"
-              84:             String  "shadow"
-              90:             String  "fragcolor"
-              93:             String  "fragPos"
-             100:             String  "@main"
-             106:             String  "inUV"
-             120:             String  "shadowCoord"
-             145:             String  "bool"
-             159:             String  "dist"
-             163:             String  "type.2d.image"
-             164:             String  "@type.2d.image"
-             170:             String  "textureShadowMap"
-             175:             String  "type.sampler"
-             176:             String  "@type.sampler"
-             181:             String  "samplerShadowMap"
-             185:             String  "type.sampled.image"
-             186:             String  "@type.sampled.image"
-             231:             String  "sizeQueryTemp"
-             236:             String  "int"
-             244:             String  "texDim"
-             260:             String  "elements"
-             267:             String  "levels"
-             276:             String  "scale"
-             283:             String  "dx"
-             295:             String  "dy"
-             307:             String  "shadowFactor"
-             313:             String  "count"
-             320:             String  "range"
-             327:             String  "x"
-             348:             String  "y"
-             411:             String  "i"
-             430:             String  "shadowClip"
+              68:             String  "sc"
+              83:             String  "shadow"
+              87:             String  "fragcolor"
+              91:             String  "fragPos"
+              98:             String  "@main"
+             102:             String  "inUV"
+             114:             String  "shadowCoord"
+             141:             String  "bool"
+             152:             String  "dist"
+             159:             String  "type.2d.image"
+             160:             String  "@type.2d.image"
+             166:             String  "textureShadowMap"
+             171:             String  "type.sampler"
+             172:             String  "@type.sampler"
+             177:             String  "samplerShadowMap"
+             181:             String  "type.sampled.image"
+             182:             String  "@type.sampled.image"
+             227:             String  "sizeQueryTemp"
+             234:             String  "int"
+             242:             String  "texDim"
+             258:             String  "elements"
+             265:             String  "levels"
+             272:             String  "scale"
+             279:             String  "dx"
+             291:             String  "dy"
+             303:             String  "shadowFactor"
+             309:             String  "count"
+             316:             String  "range"
+             323:             String  "x"
+             343:             String  "y"
+             409:             String  "i"
+             427:             String  "shadowClip"
              442:             String  "color"
              448:             String  "viewMatrix"
              452:             String  "Light"
@@ -67,29 +67,29 @@ spv.debuginfo.hlsl.frag
              461:             String  "displayDebugTarget"
              466:             String  "UBO"
              469:             String  "ubo"
-             522:             String  "textureposition"
-             527:             String  "samplerposition"
-             539:             String  "normal"
-             543:             String  "textureNormal"
-             548:             String  "samplerNormal"
-             558:             String  "albedo"
-             562:             String  "textureAlbedo"
-             567:             String  "samplerAlbedo"
-             657:             String  "N"
-             682:             String  "L"
-             707:             String  "V"
-             722:             String  "lightCosInnerAngle"
-             729:             String  "lightCosOuterAngle"
-             736:             String  "lightRange"
-             743:             String  "dir"
-             759:             String  "cosDir"
-             768:             String  "spotEffect"
-             778:             String  "heightAttenuation"
-             787:             String  "NdotL"
-             797:             String  "diff"
-             805:             String  "R"
-             815:             String  "NdotR"
-             825:             String  "spec"
+             523:             String  "textureposition"
+             528:             String  "samplerposition"
+             538:             String  "normal"
+             544:             String  "textureNormal"
+             549:             String  "samplerNormal"
+             557:             String  "albedo"
+             563:             String  "textureAlbedo"
+             568:             String  "samplerAlbedo"
+             662:             String  "N"
+             686:             String  "L"
+             712:             String  "V"
+             727:             String  "lightCosInnerAngle"
+             734:             String  "lightCosOuterAngle"
+             741:             String  "lightRange"
+             748:             String  "dir"
+             764:             String  "cosDir"
+             773:             String  "spotEffect"
+             783:             String  "heightAttenuation"
+             792:             String  "NdotL"
+             802:             String  "diff"
+             810:             String  "R"
+             820:             String  "NdotR"
+             830:             String  "spec"
                               Name 6  "main"
                               Name 36  "textureProj(vf4;f1;vf2;"
                               Name 33  "P"
@@ -98,33 +98,33 @@ spv.debuginfo.hlsl.frag
                               Name 62  "filterPCF(vf4;f1;"
                               Name 60  "sc"
                               Name 61  "layer"
-                              Name 82  "shadow(vf3;vf3;"
-                              Name 80  "fragcolor"
-                              Name 81  "fragPos"
-                              Name 98  "@main(vf2;"
-                              Name 97  "inUV"
-                              Name 112  "shadow"
-                              Name 118  "shadowCoord"
-                              Name 157  "dist"
-                              Name 168  "textureShadowMap"
-                              Name 179  "samplerShadowMap"
-                              Name 229  "sizeQueryTemp"
-                              Name 242  "texDim"
-                              Name 258  "elements"
-                              Name 265  "levels"
-                              Name 274  "scale"
-                              Name 281  "dx"
-                              Name 293  "dy"
-                              Name 305  "shadowFactor"
-                              Name 311  "count"
-                              Name 318  "range"
-                              Name 325  "x"
-                              Name 346  "y"
+                              Name 81  "shadow(vf3;vf3;"
+                              Name 79  "fragcolor"
+                              Name 80  "fragPos"
+                              Name 96  "@main(vf2;"
+                              Name 95  "inUV"
+                              Name 106  "shadow"
+                              Name 112  "shadowCoord"
+                              Name 150  "dist"
+                              Name 164  "textureShadowMap"
+                              Name 175  "samplerShadowMap"
+                              Name 225  "sizeQueryTemp"
+                              Name 240  "texDim"
+                              Name 256  "elements"
+                              Name 263  "levels"
+                              Name 270  "scale"
+                              Name 277  "dx"
+                              Name 289  "dy"
+                              Name 301  "shadowFactor"
+                              Name 307  "count"
+                              Name 314  "range"
+                              Name 321  "x"
+                              Name 341  "y"
+                              Name 374  "param"
                               Name 376  "param"
                               Name 378  "param"
-                              Name 380  "param"
-                              Name 409  "i"
-                              Name 428  "shadowClip"
+                              Name 407  "i"
+                              Name 425  "shadowClip"
                               Name 440  "Light"
                               MemberName 440(Light) 0  "position"
                               MemberName 440(Light) 1  "target"
@@ -138,48 +138,48 @@ spv.debuginfo.hlsl.frag
                               Name 467  "ubo"
                               MemberName 467(ubo) 0  "ubo"
                               Name 475  ""
-                              Name 485  "shadowFactor"
+                              Name 483  "shadowFactor"
                               Name 490  "param"
                               Name 492  "param"
-                              Name 513  "fragPos"
-                              Name 520  "textureposition"
-                              Name 525  "samplerposition"
-                              Name 537  "normal"
-                              Name 541  "textureNormal"
-                              Name 546  "samplerNormal"
-                              Name 556  "albedo"
-                              Name 560  "textureAlbedo"
-                              Name 565  "samplerAlbedo"
-                              Name 595  "fragcolor"
-                              Name 599  "param"
+                              Name 512  "fragPos"
+                              Name 521  "textureposition"
+                              Name 526  "samplerposition"
+                              Name 536  "normal"
+                              Name 542  "textureNormal"
+                              Name 547  "samplerNormal"
+                              Name 555  "albedo"
+                              Name 561  "textureAlbedo"
+                              Name 566  "samplerAlbedo"
+                              Name 593  "fragcolor"
                               Name 600  "param"
-                              Name 655  "N"
-                              Name 663  "i"
-                              Name 680  "L"
-                              Name 694  "dist"
-                              Name 705  "V"
-                              Name 720  "lightCosInnerAngle"
-                              Name 727  "lightCosOuterAngle"
-                              Name 734  "lightRange"
-                              Name 741  "dir"
-                              Name 757  "cosDir"
-                              Name 766  "spotEffect"
-                              Name 776  "heightAttenuation"
-                              Name 785  "NdotL"
-                              Name 795  "diff"
-                              Name 803  "R"
-                              Name 813  "NdotR"
-                              Name 823  "spec"
-                              Name 871  "param"
-                              Name 873  "param"
-                              Name 886  "inUV"
-                              Name 888  "inUV"
-                              Name 891  "@entryPointOutput"
-                              Name 892  "param"
-                              Decorate 168(textureShadowMap) DescriptorSet 0
-                              Decorate 168(textureShadowMap) Binding 5
-                              Decorate 179(samplerShadowMap) DescriptorSet 0
-                              Decorate 179(samplerShadowMap) Binding 5
+                              Name 601  "param"
+                              Name 660  "N"
+                              Name 668  "i"
+                              Name 684  "L"
+                              Name 699  "dist"
+                              Name 710  "V"
+                              Name 725  "lightCosInnerAngle"
+                              Name 732  "lightCosOuterAngle"
+                              Name 739  "lightRange"
+                              Name 746  "dir"
+                              Name 762  "cosDir"
+                              Name 771  "spotEffect"
+                              Name 781  "heightAttenuation"
+                              Name 790  "NdotL"
+                              Name 800  "diff"
+                              Name 808  "R"
+                              Name 818  "NdotR"
+                              Name 828  "spec"
+                              Name 875  "param"
+                              Name 880  "param"
+                              Name 894  "inUV"
+                              Name 896  "inUV"
+                              Name 899  "@entryPointOutput"
+                              Name 900  "param"
+                              Decorate 164(textureShadowMap) DescriptorSet 0
+                              Decorate 164(textureShadowMap) Binding 5
+                              Decorate 175(samplerShadowMap) DescriptorSet 0
+                              Decorate 175(samplerShadowMap) Binding 5
                               MemberDecorate 440(Light) 0 Offset 0
                               MemberDecorate 440(Light) 1 Offset 16
                               MemberDecorate 440(Light) 2 Offset 32
@@ -195,20 +195,20 @@ spv.debuginfo.hlsl.frag
                               Decorate 467(ubo) Block
                               Decorate 475 DescriptorSet 0
                               Decorate 475 Binding 4
-                              Decorate 520(textureposition) DescriptorSet 0
-                              Decorate 520(textureposition) Binding 1
-                              Decorate 525(samplerposition) DescriptorSet 0
-                              Decorate 525(samplerposition) Binding 1
-                              Decorate 541(textureNormal) DescriptorSet 0
-                              Decorate 541(textureNormal) Binding 2
-                              Decorate 546(samplerNormal) DescriptorSet 0
-                              Decorate 546(samplerNormal) Binding 2
-                              Decorate 560(textureAlbedo) DescriptorSet 0
-                              Decorate 560(textureAlbedo) Binding 3
-                              Decorate 565(samplerAlbedo) DescriptorSet 0
-                              Decorate 565(samplerAlbedo) Binding 3
-                              Decorate 888(inUV) Location 0
-                              Decorate 891(@entryPointOutput) Location 0
+                              Decorate 521(textureposition) DescriptorSet 0
+                              Decorate 521(textureposition) Binding 1
+                              Decorate 526(samplerposition) DescriptorSet 0
+                              Decorate 526(samplerposition) Binding 1
+                              Decorate 542(textureNormal) DescriptorSet 0
+                              Decorate 542(textureNormal) Binding 2
+                              Decorate 547(samplerNormal) DescriptorSet 0
+                              Decorate 547(samplerNormal) Binding 2
+                              Decorate 561(textureAlbedo) DescriptorSet 0
+                              Decorate 561(textureAlbedo) Binding 3
+                              Decorate 566(samplerAlbedo) DescriptorSet 0
+                              Decorate 566(samplerAlbedo) Binding 3
+                              Decorate 896(inUV) Location 0
+                              Decorate 899(@entryPointOutput) Location 0
                4:             TypeVoid
                5:             TypeFunction 4
                8:             TypeFloat 32
@@ -216,937 +216,929 @@ spv.debuginfo.hlsl.frag
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:             TypeVector 8(float) 4
               19:     11(int) Constant 4
-              20:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
+              20:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
               21:             TypePointer Function 18(fvec4)
               22:     11(int) Constant 7
-              23:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 16
+              23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 16
               24:             TypePointer Function 8(float)
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 22 16
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 22 16
               26:             TypeVector 8(float) 2
               27:     11(int) Constant 2
-              28:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 27
+              28:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 27
               29:             TypePointer Function 26(fvec2)
-              30:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 28 22 16
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 28 22 16
               31:             TypeFunction 8(float) 21(ptr) 24(ptr) 29(ptr)
-              32:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 10 28
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 41
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 10 28
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 41
               42:     11(int) Constant 61
               44:     11(int) Constant 1
               45:     11(int) Constant 5
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 44 19 40 45
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 38 32 40 42 16 43 38 17 42
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 20 40 42 16 39 19 44
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 10 40 42 16 39 19 27
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 56 28 40 42 16 39 19 17
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 44 19 40 45
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 38 32 40 42 16 43 38 17 42
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 47 20 40 42 16 39 19 44
+              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 10 40 42 16 39 19 27
+              55:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 56 28 40 42 16 39 19 17
               58:             TypeFunction 8(float) 21(ptr) 24(ptr)
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 10
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 10
               66:     11(int) Constant 78
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 64 59 40 66 16 43 64 17 66
-              69:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 70 20 40 66 16 65 19 44
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 10 40 66 16 65 19 27
-              74:             TypeVector 8(float) 3
-              75:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
-              76:             TypePointer Function 74(fvec3)
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 75 22 16
-              78:             TypeFunction 74(fvec3) 76(ptr) 76(ptr)
-              79:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 75 75 75
-              86:     11(int) Constant 101
-              85:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 84 79 40 86 16 43 84 17 86
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 90 75 40 86 16 85 19 44
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 93 75 40 86 16 85 19 27
-              95:             TypeFunction 18(fvec4) 29(ptr)
-              96:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 20 28
-             102:     11(int) Constant 119
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 100 96 40 102 16 43 100 17 102
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 106 28 40 102 16 101 19 44
-             111:     11(int) Constant 62
-             113:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 84 10 40 111 16 39 19
-             115:    8(float) Constant 1065353216
-             117:     11(int) Constant 63
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 120 20 40 117 16 39 19
-             128:     11(int) Constant 64
-             131:    8(float) Constant 1056964608
-             140:     11(int) Constant 66
-             143:    8(float) Constant 3212836864
-             144:             TypeBool
-             146:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 145 14 27 16
-             156:     11(int) Constant 68
-             158:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 159 10 40 156 16 39 19
-             161:             TypeImage 8(float) 2D array sampled format:Unknown
-             165:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             162:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 163 16 40 156 16 43 164 165 17
-             166:             TypePointer UniformConstant 161
-             167:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 162 16 16
-168(textureShadowMap):    166(ptr) Variable UniformConstant
-             171:     11(int) Constant 8
-             169:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 170 162 40 156 16 43 170 168(textureShadowMap) 171
-             173:             TypeSampler
-             174:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 44 40 156 16 43 176 165 17
-             177:             TypePointer UniformConstant 173
-             178:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 174 16 16
-179(samplerShadowMap):    177(ptr) Variable UniformConstant
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 181 174 40 156 16 43 181 179(samplerShadowMap) 171
-             183:             TypeSampledImage 161
-             184:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 185 16 40 156 16 43 186 165 17
-             199:     11(int) Constant 69
-             202:    8(float) Constant 0
-             213:     11(int) Constant 71
-             214:    8(float) Constant 1048576000
-             217:     11(int) Constant 74
-             224:     11(int) Constant 80
-             225:             TypeVector 11(int) 3
-             226:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 13 17
-             227:             TypePointer Function 225(ivec3)
-             228:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 226 22 16
-             230:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 231 226 40 224 16 65 19
-             235:             TypeInt 32 1
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 236 14 19 16
-             238:             TypeVector 235(int) 2
-             239:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 237 27
-             240:             TypePointer Function 238(ivec2)
-             241:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 239 22 16
-             243:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 244 239 40 224 16 65 19
-             246:             TypePointer Function 11(int)
-             247:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 22 16
-             251:             TypePointer Function 235(int)
-             252:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 237 22 16
-             259:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 260 237 40 224 16 65 19
-             266:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 267 237 40 224 16 65 19
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 64 59 40 66 16 43 64 17 66
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 68 20 40 66 16 65 19 44
+              71:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 53 10 40 66 16 65 19 27
+              73:             TypeVector 8(float) 3
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+              75:             TypePointer Function 73(fvec3)
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 74 22 16
+              77:             TypeFunction 73(fvec3) 75(ptr) 75(ptr)
+              78:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 74 74 74
+              85:     11(int) Constant 101
+              84:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 83 78 40 85 16 43 83 17 85
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 74 40 85 16 84 19 44
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 91 74 40 85 16 84 19 27
+              93:             TypeFunction 18(fvec4) 29(ptr)
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 20 28
+             100:     11(int) Constant 119
+              99:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 98 94 40 100 16 43 98 17 100
+             101:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 102 28 40 100 16 99 19 44
+             108:     11(int) Constant 62
+             107:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 83 10 40 108 16 39 19
+             111:    8(float) Constant 1065353216
+             115:     11(int) Constant 63
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 114 20 40 115 16 39 19
+             125:     11(int) Constant 64
+             127:    8(float) Constant 1056964608
+             137:     11(int) Constant 66
+             139:    8(float) Constant 3212836864
+             140:             TypeBool
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 141 14 27 16
+             153:     11(int) Constant 68
+             151:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 152 10 40 153 16 39 19
+             157:             TypeImage 8(float) 2D array sampled format:Unknown
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 159 16 40 153 16 43 160 161 17
+             162:             TypePointer UniformConstant 157
+             163:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 158 16 16
+164(textureShadowMap):    162(ptr) Variable UniformConstant
+             167:     11(int) Constant 8
+             165:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 166 158 40 153 16 43 166 164(textureShadowMap) 167
+             169:             TypeSampler
+             170:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 171 44 40 153 16 43 172 161 17
+             173:             TypePointer UniformConstant 169
+             174:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 170 16 16
+175(samplerShadowMap):    173(ptr) Variable UniformConstant
+             176:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 177 170 40 153 16 43 177 175(samplerShadowMap) 167
+             179:             TypeSampledImage 157
+             180:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 181 16 40 153 16 43 182 161 17
+             196:     11(int) Constant 69
+             198:    8(float) Constant 0
+             207:    8(float) Constant 1048576000
+             210:     11(int) Constant 71
+             215:     11(int) Constant 74
+             221:             TypeVector 11(int) 3
+             222:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 13 17
+             223:             TypePointer Function 221(ivec3)
+             224:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 222 22 16
+             228:     11(int) Constant 80
+             226:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 227 222 40 228 16 65 19
+             233:             TypeInt 32 1
+             235:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 234 14 19 16
+             236:             TypeVector 233(int) 2
+             237:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 235 27
+             238:             TypePointer Function 236(ivec2)
+             239:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 237 22 16
+             241:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 242 237 40 228 16 65 19
+             244:             TypePointer Function 11(int)
+             245:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 22 16
+             249:             TypePointer Function 233(int)
+             250:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 235 22 16
+             257:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 258 235 40 228 16 65 19
+             264:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 265 235 40 228 16 65 19
              273:     11(int) Constant 81
-             275:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 276 10 40 273 16 65 19
-             278:    8(float) Constant 1069547520
+             271:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 272 10 40 273 16 65 19
+             276:    8(float) Constant 1069547520
              280:     11(int) Constant 82
-             282:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 283 10 40 280 16 65 19
+             278:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 279 10 40 280 16 65 19
              292:     11(int) Constant 83
-             294:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 295 10 40 292 16 65 19
+             290:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 291 10 40 292 16 65 19
              304:     11(int) Constant 85
-             306:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 307 10 40 304 16 65 19
+             302:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 303 10 40 304 16 65 19
              310:     11(int) Constant 86
-             312:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 313 237 40 310 16 65 19
-             315:    235(int) Constant 0
+             308:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 309 235 40 310 16 65 19
+             313:    233(int) Constant 0
              317:     11(int) Constant 87
-             319:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 320 237 40 317 16 65 19
-             322:    235(int) Constant 1
+             315:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 316 235 40 317 16 65 19
+             320:    233(int) Constant 1
              324:     11(int) Constant 89
-             326:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 327 237 40 324 16 65 19
-             345:     11(int) Constant 91
-             347:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 348 237 40 345 16 65 19
-             366:     11(int) Constant 93
-             385:     11(int) Constant 94
+             322:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 323 235 40 324 16 65 19
+             344:     11(int) Constant 91
+             342:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 343 235 40 344 16 65 19
+             365:     11(int) Constant 93
+             384:     11(int) Constant 94
              398:     11(int) Constant 98
-             408:     11(int) Constant 102
-             410:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 411 237 40 408 16 85 19
-             423:    235(int) Constant 3
-             427:     11(int) Constant 104
-             429:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 430 20 40 427 16 85 19
+             410:     11(int) Constant 102
+             408:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 409 235 40 410 16 84 19
+             423:    233(int) Constant 3
+             428:     11(int) Constant 104
+             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 427 20 40 428 16 84 19
              437:             TypeMatrix 18(fvec4) 4
-             439:   144(bool) ConstantTrue
-             438:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 439
+             439:   140(bool) ConstantTrue
+             438:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 439
       440(Light):             TypeStruct 18(fvec4) 18(fvec4) 18(fvec4) 437
              443:     11(int) Constant 46
              444:     11(int) Constant 14
-             441:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
-             445:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
-             446:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
+             441:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
+             445:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
+             446:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
              449:     11(int) Constant 47
              450:     11(int) Constant 21
-             447:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 448 438 40 449 450 16 16 17
-             451:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 452 44 40 427 16 43 452 16 17 441 445 446 447
+             447:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 448 438 40 449 450 16 16 17
+             451:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 452 44 40 428 16 43 452 16 17 441 445 446 447
              453:             TypeArray 440(Light) 17
-             454:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 451 17
-        455(UBO):             TypeStruct 18(fvec4) 453 235(int) 235(int)
-             456:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
+             454:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 451 17
+        455(UBO):             TypeStruct 18(fvec4) 453 233(int) 233(int)
+             456:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 442 20 40 443 444 16 16 17
              459:     11(int) Constant 53
-             457:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 458 454 40 459 444 16 16 17
+             457:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 458 454 40 459 444 16 16 17
              462:     11(int) Constant 55
              463:     11(int) Constant 24
-             460:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 461 237 40 462 463 16 16 17
-             464:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 461 237 40 462 463 16 16 17
-             465:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 466 44 40 427 16 43 466 16 17 456 457 460 464
+             460:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 461 235 40 462 463 16 16 17
+             464:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 461 235 40 462 463 16 16 17
+             465:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 466 44 40 428 16 43 466 16 17 456 457 460 464
         467(ubo):             TypeStruct 455(UBO)
              470:     11(int) Constant 58
              471:     11(int) Constant 37
-             468:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 469 465 40 470 471 16 16 17
-             472:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 469 44 40 427 16 43 469 16 17 468
+             468:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 469 465 40 470 471 16 16 17
+             472:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 469 44 40 428 16 43 469 16 17 468
              473:             TypePointer Uniform 467(ubo)
-             474:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 472 27 16
+             474:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 472 27 16
              475:    473(ptr) Variable Uniform
-             476:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 472 40 427 16 43 1 475 171
+             476:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 472 40 428 16 43 2 475 167
              478:             TypePointer Uniform 437
-             479:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 438 27 16
-             484:     11(int) Constant 108
-             486:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 307 10 40 484 16 85 19
-             495:     11(int) Constant 113
-             505:     11(int) Constant 115
-             512:     11(int) Constant 121
-             514:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 93 75 40 512 16 101 19
-             516:             TypeImage 8(float) 2D sampled format:Unknown
-             517:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 163 16 40 512 16 43 164 165 17
-             518:             TypePointer UniformConstant 516
-             519:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 517 16 16
-520(textureposition):    518(ptr) Variable UniformConstant
-             521:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 522 517 40 512 16 43 522 520(textureposition) 171
-             524:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 44 40 512 16 43 176 165 17
-525(samplerposition):    177(ptr) Variable UniformConstant
-             526:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 527 524 40 512 16 43 527 525(samplerposition) 171
-             529:             TypeSampledImage 516
-             530:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 185 16 40 512 16 43 186 165 17
-             536:     11(int) Constant 122
-             538:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 539 75 40 536 16 101 19
-541(textureNormal):    518(ptr) Variable UniformConstant
-             542:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 543 517 40 536 16 43 543 541(textureNormal) 171
-             545:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 44 40 536 16 43 176 165 17
-546(samplerNormal):    177(ptr) Variable UniformConstant
-             547:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 548 545 40 536 16 43 548 546(samplerNormal) 171
-             555:     11(int) Constant 123
-             557:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 558 20 40 555 16 101 19
-560(textureAlbedo):    518(ptr) Variable UniformConstant
-             561:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 562 517 40 555 16 43 562 560(textureAlbedo) 171
-             564:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 175 44 40 555 16 43 176 165 17
-565(samplerAlbedo):    177(ptr) Variable UniformConstant
-             566:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 567 564 40 555 16 43 567 565(samplerAlbedo) 171
-             573:     11(int) Constant 128
-             574:             TypePointer Uniform 235(int)
-             575:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 237 27 16
-             583:     11(int) Constant 129
-             594:     11(int) Constant 131
-             596:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 90 75 40 594 16 101 19
-             598:   74(fvec3) ConstantComposite 115 115 115
-             604:     11(int) Constant 132
-             608:     11(int) Constant 134
-             611:     11(int) Constant 135
-             615:     11(int) Constant 137
-             618:     11(int) Constant 138
-             622:     11(int) Constant 140
-             626:     11(int) Constant 141
-             630:     11(int) Constant 143
-             634:     11(int) Constant 144
-             639:     11(int) Constant 146
-             648:     11(int) Constant 150
-             651:    8(float) Constant 1036831949
-             654:     11(int) Constant 152
-             656:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 657 75 40 654 16 101 19
-             662:     11(int) Constant 154
-             664:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 411 237 40 662 16 101 19
-             679:     11(int) Constant 157
-             681:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 682 75 40 679 16 101 19
-             685:             TypePointer Uniform 18(fvec4)
-             686:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 27 16
-             693:     11(int) Constant 159
-             695:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 159 10 40 693 16 101 19
-             700:     11(int) Constant 160
-             704:     11(int) Constant 163
-             706:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 707 75 40 704 16 101 19
-             715:     11(int) Constant 164
-             719:     11(int) Constant 166
-             721:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 722 10 40 719 16 101 19
-             724:    8(float) Constant 1064781546
-             726:     11(int) Constant 167
-             728:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 729 10 40 726 16 101 19
-             731:    8(float) Constant 1063781322
-             733:     11(int) Constant 168
-             735:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 736 10 40 733 16 101 19
-             738:    8(float) Constant 1120403456
-             740:     11(int) Constant 171
-             742:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 743 75 40 740 16 101 19
-             756:     11(int) Constant 174
-             758:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 759 10 40 756 16 101 19
-             765:     11(int) Constant 175
-             767:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 768 10 40 765 16 101 19
-             775:     11(int) Constant 176
-             777:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 778 10 40 775 16 101 19
-             784:     11(int) Constant 179
-             786:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 787 10 40 784 16 101 19
-             794:     11(int) Constant 180
-             796:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 797 75 40 794 16 101 19
-             802:     11(int) Constant 183
-             804:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 805 75 40 802 16 101 19
-             812:     11(int) Constant 184
-             814:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 815 10 40 812 16 101 19
-             822:     11(int) Constant 185
-             824:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 825 75 40 822 16 101 19
-             828:    8(float) Constant 1098907648
-             833:    8(float) Constant 1075838976
-             837:     11(int) Constant 187
-             846:    235(int) Constant 2
-             862:     11(int) Constant 191
-             870:     11(int) Constant 193
-             878:     11(int) Constant 196
-             887:             TypePointer Input 26(fvec2)
-       888(inUV):    887(ptr) Variable Input
-             890:             TypePointer Output 18(fvec4)
-891(@entryPointOutput):    890(ptr) Variable Output
-                              Line 1 119 1
+             479:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 438 27 16
+             485:     11(int) Constant 108
+             484:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 303 10 40 485 16 84 19
+             496:     11(int) Constant 113
+             506:     11(int) Constant 115
+             514:     11(int) Constant 121
+             513:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 91 74 40 514 16 99 19
+             517:             TypeImage 8(float) 2D sampled format:Unknown
+             518:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 159 16 40 514 16 43 160 161 17
+             519:             TypePointer UniformConstant 517
+             520:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 518 16 16
+521(textureposition):    519(ptr) Variable UniformConstant
+             522:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 523 518 40 514 16 43 523 521(textureposition) 167
+             525:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 171 44 40 514 16 43 172 161 17
+526(samplerposition):    173(ptr) Variable UniformConstant
+             527:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 528 525 40 514 16 43 528 526(samplerposition) 167
+             530:             TypeSampledImage 517
+             531:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 181 16 40 514 16 43 182 161 17
+             539:     11(int) Constant 122
+             537:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 538 74 40 539 16 99 19
+542(textureNormal):    519(ptr) Variable UniformConstant
+             543:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 544 518 40 539 16 43 544 542(textureNormal) 167
+             546:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 171 44 40 539 16 43 172 161 17
+547(samplerNormal):    173(ptr) Variable UniformConstant
+             548:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 549 546 40 539 16 43 549 547(samplerNormal) 167
+             558:     11(int) Constant 123
+             556:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 557 20 40 558 16 99 19
+561(textureAlbedo):    519(ptr) Variable UniformConstant
+             562:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 563 518 40 558 16 43 563 561(textureAlbedo) 167
+             565:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 171 44 40 558 16 43 172 161 17
+566(samplerAlbedo):    173(ptr) Variable UniformConstant
+             567:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 568 565 40 558 16 43 568 566(samplerAlbedo) 167
+             573:             TypePointer Uniform 233(int)
+             574:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 235 27 16
+             577:     11(int) Constant 128
+             585:     11(int) Constant 129
+             595:     11(int) Constant 131
+             594:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 74 40 595 16 99 19
+             599:   73(fvec3) ConstantComposite 111 111 111
+             605:     11(int) Constant 132
+             611:     11(int) Constant 134
+             613:     11(int) Constant 135
+             619:     11(int) Constant 137
+             621:     11(int) Constant 138
+             627:     11(int) Constant 140
+             630:     11(int) Constant 141
+             636:     11(int) Constant 143
+             639:     11(int) Constant 144
+             646:     11(int) Constant 146
+             656:     11(int) Constant 150
+             658:    8(float) Constant 1036831949
+             663:     11(int) Constant 152
+             661:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 662 74 40 663 16 99 19
+             670:     11(int) Constant 154
+             669:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 409 235 40 670 16 99 19
+             687:     11(int) Constant 157
+             685:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 686 74 40 687 16 99 19
+             692:             TypePointer Uniform 18(fvec4)
+             693:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 27 16
+             701:     11(int) Constant 159
+             700:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 152 10 40 701 16 99 19
+             708:     11(int) Constant 160
+             713:     11(int) Constant 163
+             711:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 712 74 40 713 16 99 19
+             723:     11(int) Constant 164
+             728:     11(int) Constant 166
+             726:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 727 10 40 728 16 99 19
+             731:    8(float) Constant 1064781546
+             735:     11(int) Constant 167
+             733:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 734 10 40 735 16 99 19
+             738:    8(float) Constant 1063781322
+             742:     11(int) Constant 168
+             740:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 741 10 40 742 16 99 19
+             745:    8(float) Constant 1120403456
+             749:     11(int) Constant 171
+             747:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 748 74 40 749 16 99 19
+             765:     11(int) Constant 174
+             763:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 764 10 40 765 16 99 19
+             774:     11(int) Constant 175
+             772:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 773 10 40 774 16 99 19
+             784:     11(int) Constant 176
+             782:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 783 10 40 784 16 99 19
+             793:     11(int) Constant 179
+             791:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 792 10 40 793 16 99 19
+             803:     11(int) Constant 180
+             801:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 802 74 40 803 16 99 19
+             811:     11(int) Constant 183
+             809:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 810 74 40 811 16 99 19
+             821:     11(int) Constant 184
+             819:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 820 10 40 821 16 99 19
+             831:     11(int) Constant 185
+             829:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 830 74 40 831 16 99 19
+             835:    8(float) Constant 1098907648
+             840:    8(float) Constant 1075838976
+             845:     11(int) Constant 187
+             853:    233(int) Constant 2
+             870:     11(int) Constant 191
+             879:     11(int) Constant 193
+             886:     11(int) Constant 196
+             895:             TypePointer Input 26(fvec2)
+       896(inUV):    895(ptr) Variable Input
+             898:             TypePointer Output 18(fvec4)
+899(@entryPointOutput):    898(ptr) Variable Output
          6(main):           4 Function None 5
                7:             Label
-       886(inUV):     29(ptr) Variable Function
-      892(param):     29(ptr) Variable Function
-                              Line 1 119 0
-             889:   26(fvec2) Load 888(inUV)
-                              Store 886(inUV) 889
-             893:   26(fvec2) Load 886(inUV)
-                              Store 892(param) 893
-             894:   18(fvec4) FunctionCall 98(@main(vf2;) 892(param)
-                              Store 891(@entryPointOutput) 894
+       894(inUV):     29(ptr) Variable Function
+      900(param):     29(ptr) Variable Function
+             897:   26(fvec2) Load 896(inUV)
+                              Store 894(inUV) 897
+             901:   26(fvec2) Load 894(inUV)
+                              Store 900(param) 901
+             902:   18(fvec4) FunctionCall 96(@main(vf2;) 900(param)
+                              Store 899(@entryPointOutput) 902
                               Return
                               FunctionEnd
-                              Line 1 61 1
 36(textureProj(vf4;f1;vf2;):    8(float) Function None 31
            33(P):     21(ptr) FunctionParameter
        34(layer):     24(ptr) FunctionParameter
       35(offset):     29(ptr) FunctionParameter
               37:             Label
-     112(shadow):     24(ptr) Variable Function
-118(shadowCoord):     21(ptr) Variable Function
-       157(dist):     24(ptr) Variable Function
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 42 42 16 16
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 48 33(P) 51
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 52 34(layer) 51
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 55 35(offset) 51
-             108:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 39 36(textureProj(vf4;f1;vf2;)
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
-             110:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 111 111 16 16
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 113 112(shadow) 51
-                              Store 112(shadow) 115
-             116:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 117 117 16 16
-             121:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 119 118(shadowCoord) 51
-             122:   18(fvec4) Load 33(P)
-             123:     24(ptr) AccessChain 33(P) 17
-             124:    8(float) Load 123
-             125:   18(fvec4) CompositeConstruct 124 124 124 124
-             126:   18(fvec4) FDiv 122 125
-                              Store 118(shadowCoord) 126
-             127:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 128 128 16 16
-             129:   18(fvec4) Load 118(shadowCoord)
-             130:   26(fvec2) VectorShuffle 129 129 0 1
-             132:   26(fvec2) VectorTimesScalar 130 131
-             133:   26(fvec2) CompositeConstruct 131 131
-             134:   26(fvec2) FAdd 132 133
-             135:     24(ptr) AccessChain 118(shadowCoord) 16
-             136:    8(float) CompositeExtract 134 0
-                              Store 135 136
-             137:     24(ptr) AccessChain 118(shadowCoord) 44
-             138:    8(float) CompositeExtract 134 1
-                              Store 137 138
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 140 140 16 16
-             141:     24(ptr) AccessChain 118(shadowCoord) 27
-             142:    8(float) Load 141
-             147:   144(bool) FOrdGreaterThan 142 143
-             148:     24(ptr) AccessChain 118(shadowCoord) 27
-             149:    8(float) Load 148
-             150:   144(bool) FOrdLessThan 149 115
-             151:   144(bool) LogicalAnd 147 150
-                              SelectionMerge 153 None
-                              BranchConditional 151 152 153
-             152:               Label
-             154:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
-             155:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 156 156 16 16
-             160:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 158 157(dist) 51
-             172:         161   Load 168(textureShadowMap)
-             182:         173   Load 179(samplerShadowMap)
-             187:         183   SampledImage 172 182
-             188:   18(fvec4)   Load 118(shadowCoord)
-             189:   26(fvec2)   VectorShuffle 188 188 0 1
-             190:   26(fvec2)   Load 35(offset)
-             191:   26(fvec2)   FAdd 189 190
-             192:    8(float)   Load 34(layer)
-             193:    8(float)   CompositeExtract 191 0
-             194:    8(float)   CompositeExtract 191 1
-             195:   74(fvec3)   CompositeConstruct 193 194 192
-             196:   18(fvec4)   ImageSampleImplicitLod 187 195
-             197:    8(float)   CompositeExtract 196 0
-                                Store 157(dist) 197
-             198:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 199 199 16 16
-             200:     24(ptr)   AccessChain 118(shadowCoord) 17
-             201:    8(float)   Load 200
-             203:   144(bool)   FOrdGreaterThan 201 202
-             204:    8(float)   Load 157(dist)
-             205:     24(ptr)   AccessChain 118(shadowCoord) 27
-             206:    8(float)   Load 205
-             207:   144(bool)   FOrdLessThan 204 206
-             208:   144(bool)   LogicalAnd 203 207
-                                SelectionMerge 210 None
-                                BranchConditional 208 209 210
-             209:                 Label
-             211:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
-             212:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 213 213 16 16
-                                  Store 112(shadow) 214
-                                  Branch 210
-             210:               Label
-                                Branch 153
-             153:             Label
-             215:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
-             216:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 217 217 16 16
-             218:    8(float) Load 112(shadow)
-                              ReturnValue 218
+     106(shadow):     24(ptr) Variable Function
+112(shadowCoord):     21(ptr) Variable Function
+       150(dist):     24(ptr) Variable Function
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 42 42 16 16
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 46 33(P) 49
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 52 34(layer) 49
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 55 35(offset) 49
+             105:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 39 36(textureProj(vf4;f1;vf2;)
+             110:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 108 108 16 16
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 107 106(shadow) 49
+                              Store 106(shadow) 111
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 115 115 16 16
+             116:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 113 112(shadowCoord) 49
+             118:   18(fvec4) Load 33(P)
+             119:     24(ptr) AccessChain 33(P) 17
+             120:    8(float) Load 119
+             121:   18(fvec4) CompositeConstruct 120 120 120 120
+             122:   18(fvec4) FDiv 118 121
+                              Store 112(shadowCoord) 122
+             124:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 125 125 16 16
+             123:   18(fvec4) Load 112(shadowCoord)
+             126:   26(fvec2) VectorShuffle 123 123 0 1
+             128:   26(fvec2) VectorTimesScalar 126 127
+             129:   26(fvec2) CompositeConstruct 127 127
+             130:   26(fvec2) FAdd 128 129
+             131:     24(ptr) AccessChain 112(shadowCoord) 16
+             132:    8(float) CompositeExtract 130 0
+                              Store 131 132
+             133:     24(ptr) AccessChain 112(shadowCoord) 44
+             134:    8(float) CompositeExtract 130 1
+                              Store 133 134
+             136:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 137 137 16 16
+             135:     24(ptr) AccessChain 112(shadowCoord) 27
+             138:    8(float) Load 135
+             143:   140(bool) FOrdGreaterThan 138 139
+             144:     24(ptr) AccessChain 112(shadowCoord) 27
+             145:    8(float) Load 144
+             146:   140(bool) FOrdLessThan 145 111
+             147:   140(bool) LogicalAnd 143 146
+                              SelectionMerge 149 None
+                              BranchConditional 147 148 149
+             148:               Label
+             155:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
+             156:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 153 153 16 16
+             154:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 151 150(dist) 49
+             168:         157   Load 164(textureShadowMap)
+             178:         169   Load 175(samplerShadowMap)
+             183:         179   SampledImage 168 178
+             184:   18(fvec4)   Load 112(shadowCoord)
+             185:   26(fvec2)   VectorShuffle 184 184 0 1
+             186:   26(fvec2)   Load 35(offset)
+             187:   26(fvec2)   FAdd 185 186
+             188:    8(float)   Load 34(layer)
+             189:    8(float)   CompositeExtract 187 0
+             190:    8(float)   CompositeExtract 187 1
+             191:   73(fvec3)   CompositeConstruct 189 190 188
+             192:   18(fvec4)   ImageSampleImplicitLod 183 191
+             193:    8(float)   CompositeExtract 192 0
+                                Store 150(dist) 193
+             195:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 196 196 16 16
+             194:     24(ptr)   AccessChain 112(shadowCoord) 17
+             197:    8(float)   Load 194
+             199:   140(bool)   FOrdGreaterThan 197 198
+             200:    8(float)   Load 150(dist)
+             201:     24(ptr)   AccessChain 112(shadowCoord) 27
+             202:    8(float)   Load 201
+             203:   140(bool)   FOrdLessThan 200 202
+             204:   140(bool)   LogicalAnd 199 203
+                                SelectionMerge 206 None
+                                BranchConditional 204 205 206
+             205:                 Label
+             208:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
+             209:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 210 210 16 16
+                                  Store 106(shadow) 207
+                                  Branch 206
+             206:               Label
+             211:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
+                                Branch 149
+             149:             Label
+             213:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 39
+             214:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 215 215 16 16
+             212:    8(float) Load 106(shadow)
+                              ReturnValue 212
                               FunctionEnd
-                              Line 1 78 1
 62(filterPCF(vf4;f1;):    8(float) Function None 58
           60(sc):     21(ptr) FunctionParameter
        61(layer):     24(ptr) FunctionParameter
               63:             Label
-229(sizeQueryTemp):    227(ptr) Variable Function
-     242(texDim):    240(ptr) Variable Function
-   258(elements):    251(ptr) Variable Function
-     265(levels):    251(ptr) Variable Function
-      274(scale):     24(ptr) Variable Function
-         281(dx):     24(ptr) Variable Function
-         293(dy):     24(ptr) Variable Function
-305(shadowFactor):     24(ptr) Variable Function
-      311(count):    251(ptr) Variable Function
-      318(range):    251(ptr) Variable Function
-          325(x):    251(ptr) Variable Function
-          346(y):    251(ptr) Variable Function
-      376(param):     21(ptr) Variable Function
-      378(param):     24(ptr) Variable Function
-      380(param):     29(ptr) Variable Function
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 66 66 16 16
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 69 60(sc) 51
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 72 61(layer) 51
-             221:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 65 62(filterPCF(vf4;f1;)
-             222:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             223:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 224 224 16 16
-             232:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 230 229(sizeQueryTemp) 51
-             233:         161 Load 168(textureShadowMap)
-             234:  225(ivec3) ImageQuerySizeLod 233 16
-                              Store 229(sizeQueryTemp) 234
-             245:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 243 242(texDim) 51
-             248:    246(ptr) AccessChain 229(sizeQueryTemp) 16
-             249:     11(int) Load 248
-             250:    235(int) Bitcast 249
-             253:    251(ptr) AccessChain 242(texDim) 16
-                              Store 253 250
-             254:    246(ptr) AccessChain 229(sizeQueryTemp) 44
-             255:     11(int) Load 254
-             256:    235(int) Bitcast 255
-             257:    251(ptr) AccessChain 242(texDim) 44
-                              Store 257 256
-             261:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 259 258(elements) 51
-             262:    246(ptr) AccessChain 229(sizeQueryTemp) 27
-             263:     11(int) Load 262
-             264:    235(int) Bitcast 263
-                              Store 258(elements) 264
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 266 265(levels) 51
-             269:         161 Load 168(textureShadowMap)
-             270:     11(int) ImageQueryLevels 269
-             271:    235(int) Bitcast 270
-                              Store 265(levels) 271
-             272:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 273 273 16 16
-             277:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 275 274(scale) 51
-                              Store 274(scale) 278
-             279:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 280 280 16 16
-             284:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 282 281(dx) 51
-             285:    8(float) Load 274(scale)
-             286:    8(float) FMul 285 115
-             287:    251(ptr) AccessChain 242(texDim) 16
-             288:    235(int) Load 287
-             289:    8(float) ConvertSToF 288
-             290:    8(float) FDiv 286 289
-                              Store 281(dx) 290
-             291:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 292 292 16 16
-             296:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 294 293(dy) 51
-             297:    8(float) Load 274(scale)
-             298:    8(float) FMul 297 115
-             299:    251(ptr) AccessChain 242(texDim) 44
-             300:    235(int) Load 299
-             301:    8(float) ConvertSToF 300
-             302:    8(float) FDiv 298 301
-                              Store 293(dy) 302
-             303:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 304 304 16 16
-             308:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 306 305(shadowFactor) 51
-                              Store 305(shadowFactor) 202
-             309:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 310 310 16 16
-             314:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 312 311(count) 51
-                              Store 311(count) 315
-             316:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 317 317 16 16
-             321:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 319 318(range) 51
-                              Store 318(range) 322
-             323:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
-             328:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 326 325(x) 51
-             329:    235(int) Load 318(range)
-             330:    235(int) SNegate 329
-                              Store 325(x) 330
-                              Branch 331
-             331:             Label
-             335:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             336:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
-                              LoopMerge 333 334 None
-                              Branch 337
-             337:             Label
-             338:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             339:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
-             340:    235(int) Load 325(x)
-             341:    235(int) Load 318(range)
-             342:   144(bool) SLessThanEqual 340 341
-                              BranchConditional 342 332 333
-             332:               Label
-             343:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             344:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 345 345 16 16
-             349:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 347 346(y) 51
-             350:    235(int)   Load 318(range)
-             351:    235(int)   SNegate 350
-                                Store 346(y) 351
-                                Branch 352
-             352:               Label
-             356:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             357:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 345 345 16 16
-                                LoopMerge 354 355 None
-                                Branch 358
-             358:               Label
-             359:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             360:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 345 345 16 16
-             361:    235(int)   Load 346(y)
-             362:    235(int)   Load 318(range)
-             363:   144(bool)   SLessThanEqual 361 362
-                                BranchConditional 363 353 354
-             353:                 Label
-             364:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             365:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 366 366 16 16
-             367:    8(float)     Load 281(dx)
-             368:    235(int)     Load 325(x)
-             369:    8(float)     ConvertSToF 368
-             370:    8(float)     FMul 367 369
-             371:    8(float)     Load 293(dy)
-             372:    235(int)     Load 346(y)
-             373:    8(float)     ConvertSToF 372
-             374:    8(float)     FMul 371 373
-             375:   26(fvec2)     CompositeConstruct 370 374
-             377:   18(fvec4)     Load 60(sc)
+225(sizeQueryTemp):    223(ptr) Variable Function
+     240(texDim):    238(ptr) Variable Function
+   256(elements):    249(ptr) Variable Function
+     263(levels):    249(ptr) Variable Function
+      270(scale):     24(ptr) Variable Function
+         277(dx):     24(ptr) Variable Function
+         289(dy):     24(ptr) Variable Function
+301(shadowFactor):     24(ptr) Variable Function
+      307(count):    249(ptr) Variable Function
+      314(range):    249(ptr) Variable Function
+          321(x):    249(ptr) Variable Function
+          341(y):    249(ptr) Variable Function
+      374(param):     21(ptr) Variable Function
+      376(param):     24(ptr) Variable Function
+      378(param):     29(ptr) Variable Function
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+              69:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 67 60(sc) 49
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 71 61(layer) 49
+             220:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 66 66 16 16
+             219:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 65 62(filterPCF(vf4;f1;)
+             230:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 228 228 16 16
+             229:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 226 225(sizeQueryTemp) 49
+             231:         157 Load 164(textureShadowMap)
+             232:  221(ivec3) ImageQuerySizeLod 231 16
+                              Store 225(sizeQueryTemp) 232
+             243:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 241 240(texDim) 49
+             246:    244(ptr) AccessChain 225(sizeQueryTemp) 16
+             247:     11(int) Load 246
+             248:    233(int) Bitcast 247
+             251:    249(ptr) AccessChain 240(texDim) 16
+                              Store 251 248
+             252:    244(ptr) AccessChain 225(sizeQueryTemp) 44
+             253:     11(int) Load 252
+             254:    233(int) Bitcast 253
+             255:    249(ptr) AccessChain 240(texDim) 44
+                              Store 255 254
+             259:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 257 256(elements) 49
+             260:    244(ptr) AccessChain 225(sizeQueryTemp) 27
+             261:     11(int) Load 260
+             262:    233(int) Bitcast 261
+                              Store 256(elements) 262
+             266:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 264 263(levels) 49
+             267:         157 Load 164(textureShadowMap)
+             268:     11(int) ImageQueryLevels 267
+             269:    233(int) Bitcast 268
+                              Store 263(levels) 269
+             275:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 273 273 16 16
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 271 270(scale) 49
+                              Store 270(scale) 276
+             282:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 280 280 16 16
+             281:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 278 277(dx) 49
+             283:    8(float) Load 270(scale)
+             284:    8(float) FMul 283 111
+             285:    249(ptr) AccessChain 240(texDim) 16
+             286:    233(int) Load 285
+             287:    8(float) ConvertSToF 286
+             288:    8(float) FDiv 284 287
+                              Store 277(dx) 288
+             294:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 292 292 16 16
+             293:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 290 289(dy) 49
+             295:    8(float) Load 270(scale)
+             296:    8(float) FMul 295 111
+             297:    249(ptr) AccessChain 240(texDim) 44
+             298:    233(int) Load 297
+             299:    8(float) ConvertSToF 298
+             300:    8(float) FDiv 296 299
+                              Store 289(dy) 300
+             306:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 304 304 16 16
+             305:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 302 301(shadowFactor) 49
+                              Store 301(shadowFactor) 198
+             312:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 310 310 16 16
+             311:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 308 307(count) 49
+                              Store 307(count) 313
+             319:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 317 317 16 16
+             318:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 315 314(range) 49
+                              Store 314(range) 320
+             326:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
+             325:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 322 321(x) 49
+             327:    233(int) Load 314(range)
+             328:    233(int) SNegate 327
+                              Store 321(x) 328
+                              Branch 329
+             329:             Label
+             333:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             334:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
+                              LoopMerge 331 332 None
+                              Branch 335
+             335:             Label
+             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             338:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
+             336:    233(int) Load 321(x)
+             339:    233(int) Load 314(range)
+             340:   140(bool) SLessThanEqual 336 339
+                              BranchConditional 340 330 331
+             330:               Label
+             346:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             347:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 344 344 16 16
+             345:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 342 341(y) 49
+             348:    233(int)   Load 314(range)
+             349:    233(int)   SNegate 348
+                                Store 341(y) 349
+                                Branch 350
+             350:               Label
+             354:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             355:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 344 344 16 16
+                                LoopMerge 352 353 None
+                                Branch 356
+             356:               Label
+             358:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             359:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 344 344 16 16
+             357:    233(int)   Load 341(y)
+             360:    233(int)   Load 314(range)
+             361:   140(bool)   SLessThanEqual 357 360
+                                BranchConditional 361 351 352
+             351:                 Label
+             363:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             364:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 365 365 16 16
+             362:    8(float)     Load 277(dx)
+             366:    233(int)     Load 321(x)
+             367:    8(float)     ConvertSToF 366
+             368:    8(float)     FMul 362 367
+             369:    8(float)     Load 289(dy)
+             370:    233(int)     Load 341(y)
+             371:    8(float)     ConvertSToF 370
+             372:    8(float)     FMul 369 371
+             373:   26(fvec2)     CompositeConstruct 368 372
+             375:   18(fvec4)     Load 60(sc)
+                                  Store 374(param) 375
+             377:    8(float)     Load 61(layer)
                                   Store 376(param) 377
-             379:    8(float)     Load 61(layer)
-                                  Store 378(param) 379
-                                  Store 380(param) 375
-             381:    8(float)     FunctionCall 36(textureProj(vf4;f1;vf2;) 376(param) 378(param) 380(param)
-             382:    8(float)     Load 305(shadowFactor)
-             383:    8(float)     FAdd 382 381
-                                  Store 305(shadowFactor) 383
-             384:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 385 385 16 16
-             386:    235(int)     Load 311(count)
-             387:    235(int)     IAdd 386 322
-                                  Store 311(count) 387
-                                  Branch 355
-             355:                 Label
-             388:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             389:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 345 345 16 16
-             390:    235(int)     Load 346(y)
-             391:    235(int)     IAdd 390 322
-                                  Store 346(y) 391
-                                  Branch 352
-             354:               Label
-                                Branch 334
-             334:               Label
-             392:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             393:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
-             394:    235(int)   Load 325(x)
-             395:    235(int)   IAdd 394 322
-                                Store 325(x) 395
-                                Branch 331
-             333:             Label
-             396:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
-             397:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 398 398 16 16
-             399:    8(float) Load 305(shadowFactor)
-             400:    235(int) Load 311(count)
-             401:    8(float) ConvertSToF 400
-             402:    8(float) FDiv 399 401
-                              ReturnValue 402
+                                  Store 378(param) 373
+             379:    8(float)     FunctionCall 36(textureProj(vf4;f1;vf2;) 374(param) 376(param) 378(param)
+             380:    8(float)     Load 301(shadowFactor)
+             381:    8(float)     FAdd 380 379
+                                  Store 301(shadowFactor) 381
+             383:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 384 384 16 16
+             382:    233(int)     Load 307(count)
+             385:    233(int)     IAdd 382 320
+                                  Store 307(count) 385
+                                  Branch 353
+             353:                 Label
+             387:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             388:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 344 344 16 16
+             386:    233(int)     Load 341(y)
+             389:    233(int)     IAdd 386 320
+                                  Store 341(y) 389
+                                  Branch 350
+             352:               Label
+             390:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+                                Branch 332
+             332:               Label
+             392:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             393:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 324 324 16 16
+             391:    233(int)   Load 321(x)
+             394:    233(int)   IAdd 391 320
+                                Store 321(x) 394
+                                Branch 329
+             331:             Label
+             396:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 65
+             397:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 398 398 16 16
+             395:    8(float) Load 301(shadowFactor)
+             399:    233(int) Load 307(count)
+             400:    8(float) ConvertSToF 399
+             401:    8(float) FDiv 395 400
+                              ReturnValue 401
                               FunctionEnd
-                              Line 1 101 49
-82(shadow(vf3;vf3;):   74(fvec3) Function None 78
-   80(fragcolor):     76(ptr) FunctionParameter
-     81(fragPos):     76(ptr) FunctionParameter
-              83:             Label
-          409(i):    251(ptr) Variable Function
- 428(shadowClip):     21(ptr) Variable Function
-485(shadowFactor):     24(ptr) Variable Function
+81(shadow(vf3;vf3;):   73(fvec3) Function None 77
+   79(fragcolor):     75(ptr) FunctionParameter
+     80(fragPos):     75(ptr) FunctionParameter
+              82:             Label
+          407(i):    249(ptr) Variable Function
+ 425(shadowClip):     21(ptr) Variable Function
+483(shadowFactor):     24(ptr) Variable Function
       490(param):     21(ptr) Variable Function
       492(param):     24(ptr) Variable Function
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 86 86 16 16
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 89 80(fragcolor) 51
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 92 81(fragPos) 51
-             405:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 85 82(shadow(vf3;vf3;)
-             406:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             407:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 408 408 16 16
-             412:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 410 409(i) 51
-                              Store 409(i) 315
+              89:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 86 79(fragcolor) 49
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 90 80(fragPos) 49
+             406:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 85 85 16 16
+             405:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 84 81(shadow(vf3;vf3;)
+             412:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 410 410 16 16
+             411:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 408 407(i) 49
+                              Store 407(i) 313
                               Branch 413
              413:             Label
-             417:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             418:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 408 408 16 16
+             417:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             418:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 410 410 16 16
                               LoopMerge 415 416 None
                               Branch 419
              419:             Label
-             420:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             421:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 408 408 16 16
-             422:    235(int) Load 409(i)
-             424:   144(bool) SLessThan 422 423
+             421:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             422:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 410 410 16 16
+             420:    233(int) Load 407(i)
+             424:   140(bool) SLessThan 420 423
                               BranchConditional 424 414 415
              414:               Label
-             425:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             426:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 427 427 16 16
-             431:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 429 428(shadowClip) 51
-             432:   74(fvec3)   Load 81(fragPos)
+             430:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             431:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 428 428 16 16
+             429:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 426 425(shadowClip) 49
+             432:   73(fvec3)   Load 80(fragPos)
              433:    8(float)   CompositeExtract 432 0
              434:    8(float)   CompositeExtract 432 1
              435:    8(float)   CompositeExtract 432 2
-             436:   18(fvec4)   CompositeConstruct 433 434 435 115
-             477:    235(int)   Load 409(i)
-             480:    478(ptr)   AccessChain 475 315 322 477 423
+             436:   18(fvec4)   CompositeConstruct 433 434 435 111
+             477:    233(int)   Load 407(i)
+             480:    478(ptr)   AccessChain 475 313 320 477 423
              481:         437   Load 480
              482:   18(fvec4)   VectorTimesMatrix 436 481
-                                Store 428(shadowClip) 482
-             483:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 484 484 16 16
-             487:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 486 485(shadowFactor) 51
-             488:    235(int)   Load 409(i)
+                                Store 425(shadowClip) 482
+             487:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 485 485 16 16
+             486:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 484 483(shadowFactor) 49
+             488:    233(int)   Load 407(i)
              489:    8(float)   ConvertSToF 488
-             491:   18(fvec4)   Load 428(shadowClip)
+             491:   18(fvec4)   Load 425(shadowClip)
                                 Store 490(param) 491
                                 Store 492(param) 489
              493:    8(float)   FunctionCall 62(filterPCF(vf4;f1;) 490(param) 492(param)
-                                Store 485(shadowFactor) 493
-             494:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 495 495 16 16
-             496:    8(float)   Load 485(shadowFactor)
-             497:   74(fvec3)   Load 80(fragcolor)
-             498:   74(fvec3)   VectorTimesScalar 497 496
-                                Store 80(fragcolor) 498
+                                Store 483(shadowFactor) 493
+             495:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 496 496 16 16
+             494:    8(float)   Load 483(shadowFactor)
+             497:   73(fvec3)   Load 79(fragcolor)
+             498:   73(fvec3)   VectorTimesScalar 497 494
+                                Store 79(fragcolor) 498
                                 Branch 416
              416:               Label
-             499:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             500:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 408 408 16 16
-             501:    235(int)   Load 409(i)
-             502:    235(int)   IAdd 501 322
-                                Store 409(i) 502
+             500:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             501:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 410 410 16 16
+             499:    233(int)   Load 407(i)
+             502:    233(int)   IAdd 499 320
+                                Store 407(i) 502
                                 Branch 413
              415:             Label
-             503:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 85
-             504:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 505 505 16 16
-             506:   74(fvec3) Load 80(fragcolor)
-                              ReturnValue 506
+             504:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 84
+             505:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 506 506 16 16
+             503:   73(fvec3) Load 79(fragcolor)
+                              ReturnValue 503
                               FunctionEnd
-                              Line 1 119 1
-  98(@main(vf2;):   18(fvec4) Function None 95
-        97(inUV):     29(ptr) FunctionParameter
-              99:             Label
-    513(fragPos):     76(ptr) Variable Function
-     537(normal):     76(ptr) Variable Function
-     556(albedo):     21(ptr) Variable Function
-  595(fragcolor):     76(ptr) Variable Function
-      599(param):     76(ptr) Variable Function
-      600(param):     76(ptr) Variable Function
-          655(N):     76(ptr) Variable Function
-          663(i):    251(ptr) Variable Function
-          680(L):     76(ptr) Variable Function
-       694(dist):     24(ptr) Variable Function
-          705(V):     76(ptr) Variable Function
-720(lightCosInnerAngle):     24(ptr) Variable Function
-727(lightCosOuterAngle):     24(ptr) Variable Function
- 734(lightRange):     24(ptr) Variable Function
-        741(dir):     76(ptr) Variable Function
-     757(cosDir):     24(ptr) Variable Function
- 766(spotEffect):     24(ptr) Variable Function
-776(heightAttenuation):     24(ptr) Variable Function
-      785(NdotL):     24(ptr) Variable Function
-       795(diff):     76(ptr) Variable Function
-          803(R):     76(ptr) Variable Function
-      813(NdotR):     24(ptr) Variable Function
-       823(spec):     76(ptr) Variable Function
-      871(param):     76(ptr) Variable Function
-      873(param):     76(ptr) Variable Function
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 102 102 16 16
-             107:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 105 97(inUV) 51
-             509:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 101 98(@main(vf2;)
-             510:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             511:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 512 512 16 16
-             515:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 514 513(fragPos) 51
-             523:         516 Load 520(textureposition)
-             528:         173 Load 525(samplerposition)
-             531:         529 SampledImage 523 528
-             532:   26(fvec2) Load 97(inUV)
-             533:   18(fvec4) ImageSampleImplicitLod 531 532
-             534:   74(fvec3) VectorShuffle 533 533 0 1 2
-                              Store 513(fragPos) 534
-             535:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 536 536 16 16
-             540:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 538 537(normal) 51
-             544:         516 Load 541(textureNormal)
-             549:         173 Load 546(samplerNormal)
-             550:         529 SampledImage 544 549
-             551:   26(fvec2) Load 97(inUV)
-             552:   18(fvec4) ImageSampleImplicitLod 550 551
-             553:   74(fvec3) VectorShuffle 552 552 0 1 2
-                              Store 537(normal) 553
-             554:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 555 555 16 16
-             559:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 557 556(albedo) 51
-             563:         516 Load 560(textureAlbedo)
-             568:         173 Load 565(samplerAlbedo)
-             569:         529 SampledImage 563 568
-             570:   26(fvec2) Load 97(inUV)
-             571:   18(fvec4) ImageSampleImplicitLod 569 570
-                              Store 556(albedo) 571
-             572:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 573 573 16 16
-             576:    574(ptr) AccessChain 475 315 423
-             577:    235(int) Load 576
-             578:   144(bool) SGreaterThan 577 315
-                              SelectionMerge 580 None
-                              BranchConditional 578 579 580
-             579:               Label
-             581:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             582:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 583 583 16 16
-             584:    574(ptr)   AccessChain 475 315 423
-             585:    235(int)   Load 584
-                                SelectionMerge 591 None
-                                Switch 585 591 
-                                       case 1: 586
-                                       case 2: 587
-                                       case 3: 588
-                                       case 4: 589
-                                       case 5: 590
-             586:                 Label
-             592:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             593:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 594 594 16 16
-             597:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 596 595(fragcolor) 51
-                                  Store 599(param) 598
-             601:   74(fvec3)     Load 513(fragPos)
-                                  Store 600(param) 601
-             602:   74(fvec3)     FunctionCall 82(shadow(vf3;vf3;) 599(param) 600(param)
-                                  Store 595(fragcolor) 602
-             603:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 604 604 16 16
-                                  Branch 591
+  96(@main(vf2;):   18(fvec4) Function None 93
+        95(inUV):     29(ptr) FunctionParameter
+              97:             Label
+    512(fragPos):     75(ptr) Variable Function
+     536(normal):     75(ptr) Variable Function
+     555(albedo):     21(ptr) Variable Function
+  593(fragcolor):     75(ptr) Variable Function
+      600(param):     75(ptr) Variable Function
+      601(param):     75(ptr) Variable Function
+          660(N):     75(ptr) Variable Function
+          668(i):    249(ptr) Variable Function
+          684(L):     75(ptr) Variable Function
+       699(dist):     24(ptr) Variable Function
+          710(V):     75(ptr) Variable Function
+725(lightCosInnerAngle):     24(ptr) Variable Function
+732(lightCosOuterAngle):     24(ptr) Variable Function
+ 739(lightRange):     24(ptr) Variable Function
+        746(dir):     75(ptr) Variable Function
+     762(cosDir):     24(ptr) Variable Function
+ 771(spotEffect):     24(ptr) Variable Function
+781(heightAttenuation):     24(ptr) Variable Function
+      790(NdotL):     24(ptr) Variable Function
+       800(diff):     75(ptr) Variable Function
+          808(R):     75(ptr) Variable Function
+      818(NdotR):     24(ptr) Variable Function
+       828(spec):     75(ptr) Variable Function
+      875(param):     75(ptr) Variable Function
+      880(param):     75(ptr) Variable Function
+             104:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 101 95(inUV) 49
+             511:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 100 100 16 16
+             510:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 99 96(@main(vf2;)
+             516:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 514 514 16 16
+             515:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 513 512(fragPos) 49
+             524:         517 Load 521(textureposition)
+             529:         169 Load 526(samplerposition)
+             532:         530 SampledImage 524 529
+             533:   26(fvec2) Load 95(inUV)
+             534:   18(fvec4) ImageSampleImplicitLod 532 533
+             535:   73(fvec3) VectorShuffle 534 534 0 1 2
+                              Store 512(fragPos) 535
+             541:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 539 539 16 16
+             540:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 537 536(normal) 49
+             545:         517 Load 542(textureNormal)
+             550:         169 Load 547(samplerNormal)
+             551:         530 SampledImage 545 550
+             552:   26(fvec2) Load 95(inUV)
+             553:   18(fvec4) ImageSampleImplicitLod 551 552
+             554:   73(fvec3) VectorShuffle 553 553 0 1 2
+                              Store 536(normal) 554
+             560:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 558 558 16 16
+             559:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 556 555(albedo) 49
+             564:         517 Load 561(textureAlbedo)
+             569:         169 Load 566(samplerAlbedo)
+             570:         530 SampledImage 564 569
+             571:   26(fvec2) Load 95(inUV)
+             572:   18(fvec4) ImageSampleImplicitLod 570 571
+                              Store 555(albedo) 572
+             576:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 577 577 16 16
+             575:    573(ptr) AccessChain 475 313 423
+             578:    233(int) Load 575
+             579:   140(bool) SGreaterThan 578 313
+                              SelectionMerge 581 None
+                              BranchConditional 579 580 581
+             580:               Label
+             583:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             584:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 585 585 16 16
+             582:    573(ptr)   AccessChain 475 313 423
+             586:    233(int)   Load 582
+                                SelectionMerge 592 None
+                                Switch 586 592 
+                                       case 1: 587
+                                       case 2: 588
+                                       case 3: 589
+                                       case 4: 590
+                                       case 5: 591
              587:                 Label
-             606:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             607:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 608 608 16 16
-             609:   74(fvec3)     Load 513(fragPos)
-                                  Store 595(fragcolor) 609
-             610:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 611 611 16 16
-                                  Branch 591
+             597:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             598:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 595 595 16 16
+             596:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 594 593(fragcolor) 49
+                                  Store 600(param) 599
+             602:   73(fvec3)     Load 512(fragPos)
+                                  Store 601(param) 602
+             603:   73(fvec3)     FunctionCall 81(shadow(vf3;vf3;) 600(param) 601(param)
+                                  Store 593(fragcolor) 603
+             604:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 605 605 16 16
+                                  Branch 592
              588:                 Label
-             613:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             614:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 615 615 16 16
-             616:   74(fvec3)     Load 537(normal)
-                                  Store 595(fragcolor) 616
-             617:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 618 618 16 16
-                                  Branch 591
+             609:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             610:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 611 611 16 16
+             608:   73(fvec3)     Load 512(fragPos)
+                                  Store 593(fragcolor) 608
+             612:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 613 613 16 16
+                                  Branch 592
              589:                 Label
-             620:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             621:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 622 622 16 16
-             623:   18(fvec4)     Load 556(albedo)
-             624:   74(fvec3)     VectorShuffle 623 623 0 1 2
-                                  Store 595(fragcolor) 624
-             625:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 626 626 16 16
-                                  Branch 591
+             617:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             618:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 619 619 16 16
+             616:   73(fvec3)     Load 536(normal)
+                                  Store 593(fragcolor) 616
+             620:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 621 621 16 16
+                                  Branch 592
              590:                 Label
-             628:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             629:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 630 630 16 16
-             631:   18(fvec4)     Load 556(albedo)
-             632:   74(fvec3)     VectorShuffle 631 631 3 3 3
-                                  Store 595(fragcolor) 632
-             633:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 634 634 16 16
-                                  Branch 591
-             591:               Label
-             637:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             638:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 639 639 16 16
-             640:   74(fvec3)   Load 595(fragcolor)
-             641:    8(float)   CompositeExtract 640 0
-             642:    8(float)   CompositeExtract 640 1
-             643:    8(float)   CompositeExtract 640 2
-             644:   18(fvec4)   CompositeConstruct 641 642 643 115
-                                ReturnValue 644
-             580:             Label
-             646:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             647:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 648 648 16 16
-             649:   18(fvec4) Load 556(albedo)
-             650:   74(fvec3) VectorShuffle 649 649 0 1 2
-             652:   74(fvec3) VectorTimesScalar 650 651
-                              Store 595(fragcolor) 652
-             653:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 654 654 16 16
-             658:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 656 655(N) 51
-             659:   74(fvec3) Load 537(normal)
-             660:   74(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 659
-                              Store 655(N) 660
-             661:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 662 662 16 16
-             665:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 664 663(i) 51
-                              Store 663(i) 315
-                              Branch 666
-             666:             Label
-             670:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             671:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 662 662 16 16
-                              LoopMerge 668 669 None
-                              Branch 672
-             672:             Label
-             673:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             674:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 662 662 16 16
-             675:    235(int) Load 663(i)
-             676:   144(bool) SLessThan 675 423
-                              BranchConditional 676 667 668
-             667:               Label
-             677:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             678:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 679 679 16 16
-             683:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 681 680(L) 51
-             684:    235(int)   Load 663(i)
-             687:    685(ptr)   AccessChain 475 315 322 684 315
-             688:   18(fvec4)   Load 687
-             689:   74(fvec3)   VectorShuffle 688 688 0 1 2
-             690:   74(fvec3)   Load 513(fragPos)
-             691:   74(fvec3)   FSub 689 690
-                                Store 680(L) 691
-             692:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 693 693 16 16
-             696:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 695 694(dist) 51
-             697:   74(fvec3)   Load 680(L)
-             698:    8(float)   ExtInst 3(GLSL.std.450) 66(Length) 697
-                                Store 694(dist) 698
-             699:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 700 700 16 16
-             701:   74(fvec3)   Load 680(L)
-             702:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 701
-                                Store 680(L) 702
-             703:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 704 704 16 16
-             708:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 706 705(V) 51
-             709:    685(ptr)   AccessChain 475 315 315
-             710:   18(fvec4)   Load 709
-             711:   74(fvec3)   VectorShuffle 710 710 0 1 2
-             712:   74(fvec3)   Load 513(fragPos)
-             713:   74(fvec3)   FSub 711 712
-                                Store 705(V) 713
-             714:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 715 715 16 16
-             716:   74(fvec3)   Load 705(V)
-             717:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 716
-                                Store 705(V) 717
-             718:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 719 719 16 16
-             723:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 721 720(lightCosInnerAngle) 51
-                                Store 720(lightCosInnerAngle) 724
-             725:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 726 726 16 16
-             730:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 728 727(lightCosOuterAngle) 51
-                                Store 727(lightCosOuterAngle) 731
-             732:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 733 733 16 16
-             737:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 735 734(lightRange) 51
-                                Store 734(lightRange) 738
-             739:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 740 740 16 16
-             744:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 742 741(dir) 51
-             745:    235(int)   Load 663(i)
-             746:    685(ptr)   AccessChain 475 315 322 745 315
-             747:   18(fvec4)   Load 746
-             748:   74(fvec3)   VectorShuffle 747 747 0 1 2
-             749:    235(int)   Load 663(i)
-             750:    685(ptr)   AccessChain 475 315 322 749 322
-             751:   18(fvec4)   Load 750
-             752:   74(fvec3)   VectorShuffle 751 751 0 1 2
-             753:   74(fvec3)   FSub 748 752
-             754:   74(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 753
-                                Store 741(dir) 754
-             755:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 756 756 16 16
-             760:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 758 757(cosDir) 51
-             761:   74(fvec3)   Load 680(L)
-             762:   74(fvec3)   Load 741(dir)
-             763:    8(float)   Dot 761 762
-                                Store 757(cosDir) 763
-             764:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 765 765 16 16
-             769:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 767 766(spotEffect) 51
-             770:    8(float)   Load 727(lightCosOuterAngle)
-             771:    8(float)   Load 720(lightCosInnerAngle)
-             772:    8(float)   Load 757(cosDir)
-             773:    8(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 770 771 772
-                                Store 766(spotEffect) 773
-             774:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 775 775 16 16
-             779:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 777 776(heightAttenuation) 51
-             780:    8(float)   Load 734(lightRange)
-             781:    8(float)   Load 694(dist)
-             782:    8(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 780 202 781
-                                Store 776(heightAttenuation) 782
-             783:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 784 784 16 16
-             788:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 786 785(NdotL) 51
-             789:   74(fvec3)   Load 655(N)
-             790:   74(fvec3)   Load 680(L)
-             791:    8(float)   Dot 789 790
-             792:    8(float)   ExtInst 3(GLSL.std.450) 40(FMax) 202 791
-                                Store 785(NdotL) 792
-             793:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 794 794 16 16
-             798:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 796 795(diff) 51
-             799:    8(float)   Load 785(NdotL)
-             800:   74(fvec3)   CompositeConstruct 799 799 799
-                                Store 795(diff) 800
-             801:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 802 802 16 16
-             806:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 804 803(R) 51
-             807:   74(fvec3)   Load 680(L)
-             808:   74(fvec3)   FNegate 807
-             809:   74(fvec3)   Load 655(N)
-             810:   74(fvec3)   ExtInst 3(GLSL.std.450) 71(Reflect) 808 809
-                                Store 803(R) 810
-             811:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 812 812 16 16
-             816:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 814 813(NdotR) 51
-             817:   74(fvec3)   Load 803(R)
-             818:   74(fvec3)   Load 705(V)
-             819:    8(float)   Dot 817 818
-             820:    8(float)   ExtInst 3(GLSL.std.450) 40(FMax) 202 819
-                                Store 813(NdotR) 820
-             821:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 822 822 16 16
-             826:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 824 823(spec) 51
-             827:    8(float)   Load 813(NdotR)
-             829:    8(float)   ExtInst 3(GLSL.std.450) 26(Pow) 827 828
-             830:     24(ptr)   AccessChain 556(albedo) 17
-             831:    8(float)   Load 830
-             832:    8(float)   FMul 829 831
-             834:    8(float)   FMul 832 833
-             835:   74(fvec3)   CompositeConstruct 834 834 834
-                                Store 823(spec) 835
-             836:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 837 837 16 16
-             838:   74(fvec3)   Load 795(diff)
-             839:   74(fvec3)   Load 823(spec)
-             840:   74(fvec3)   FAdd 838 839
-             841:    8(float)   Load 766(spotEffect)
-             842:   74(fvec3)   VectorTimesScalar 840 841
-             843:    8(float)   Load 776(heightAttenuation)
-             844:   74(fvec3)   VectorTimesScalar 842 843
-             845:    235(int)   Load 663(i)
-             847:    685(ptr)   AccessChain 475 315 322 845 846
-             848:   18(fvec4)   Load 847
-             849:   74(fvec3)   VectorShuffle 848 848 0 1 2
-             850:   74(fvec3)   FMul 844 849
-             851:   18(fvec4)   Load 556(albedo)
-             852:   74(fvec3)   VectorShuffle 851 851 0 1 2
-             853:   74(fvec3)   FMul 850 852
-             854:   74(fvec3)   Load 595(fragcolor)
-             855:   74(fvec3)   FAdd 854 853
-                                Store 595(fragcolor) 855
-                                Branch 669
-             669:               Label
-             856:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             857:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 662 662 16 16
-             858:    235(int)   Load 663(i)
-             859:    235(int)   IAdd 858 322
-                                Store 663(i) 859
-                                Branch 666
-             668:             Label
-             860:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             861:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 862 862 16 16
-             863:    574(ptr) AccessChain 475 315 846
-             864:    235(int) Load 863
-             865:   144(bool) SGreaterThan 864 315
-                              SelectionMerge 867 None
-                              BranchConditional 865 866 867
-             866:               Label
-             868:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             869:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 870 870 16 16
-             872:   74(fvec3)   Load 595(fragcolor)
-                                Store 871(param) 872
-             874:   74(fvec3)   Load 513(fragPos)
-                                Store 873(param) 874
-             875:   74(fvec3)   FunctionCall 82(shadow(vf3;vf3;) 871(param) 873(param)
-                                Store 595(fragcolor) 875
-                                Branch 867
-             867:             Label
-             876:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 101
-             877:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 878 878 16 16
-             879:   74(fvec3) Load 595(fragcolor)
-             880:    8(float) CompositeExtract 879 0
-             881:    8(float) CompositeExtract 879 1
-             882:    8(float) CompositeExtract 879 2
-             883:   18(fvec4) CompositeConstruct 880 881 882 115
-                              ReturnValue 883
+             625:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             626:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 627 627 16 16
+             624:   18(fvec4)     Load 555(albedo)
+             628:   73(fvec3)     VectorShuffle 624 624 0 1 2
+                                  Store 593(fragcolor) 628
+             629:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 630 630 16 16
+                                  Branch 592
+             591:                 Label
+             634:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             635:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 636 636 16 16
+             633:   18(fvec4)     Load 555(albedo)
+             637:   73(fvec3)     VectorShuffle 633 633 3 3 3
+                                  Store 593(fragcolor) 637
+             638:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 639 639 16 16
+                                  Branch 592
+             592:               Label
+             644:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             645:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 646 646 16 16
+             643:   73(fvec3)   Load 593(fragcolor)
+             647:    8(float)   CompositeExtract 643 0
+             648:    8(float)   CompositeExtract 643 1
+             649:    8(float)   CompositeExtract 643 2
+             650:   18(fvec4)   CompositeConstruct 647 648 649 111
+                                ReturnValue 650
+             581:             Label
+             654:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             655:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 656 656 16 16
+             653:   18(fvec4) Load 555(albedo)
+             657:   73(fvec3) VectorShuffle 653 653 0 1 2
+             659:   73(fvec3) VectorTimesScalar 657 658
+                              Store 593(fragcolor) 659
+             665:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 663 663 16 16
+             664:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 661 660(N) 49
+             666:   73(fvec3) Load 536(normal)
+             667:   73(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 666
+                              Store 660(N) 667
+             672:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 670 670 16 16
+             671:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 669 668(i) 49
+                              Store 668(i) 313
+                              Branch 673
+             673:             Label
+             677:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             678:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 670 670 16 16
+                              LoopMerge 675 676 None
+                              Branch 679
+             679:             Label
+             681:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             682:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 670 670 16 16
+             680:    233(int) Load 668(i)
+             683:   140(bool) SLessThan 680 423
+                              BranchConditional 683 674 675
+             674:               Label
+             689:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             690:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 687 687 16 16
+             688:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 685 684(L) 49
+             691:    233(int)   Load 668(i)
+             694:    692(ptr)   AccessChain 475 313 320 691 313
+             695:   18(fvec4)   Load 694
+             696:   73(fvec3)   VectorShuffle 695 695 0 1 2
+             697:   73(fvec3)   Load 512(fragPos)
+             698:   73(fvec3)   FSub 696 697
+                                Store 684(L) 698
+             703:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 701 701 16 16
+             702:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 700 699(dist) 49
+             704:   73(fvec3)   Load 684(L)
+             705:    8(float)   ExtInst 3(GLSL.std.450) 66(Length) 704
+                                Store 699(dist) 705
+             707:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 708 708 16 16
+             706:   73(fvec3)   Load 684(L)
+             709:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 706
+                                Store 684(L) 709
+             715:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 713 713 16 16
+             714:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 711 710(V) 49
+             716:    692(ptr)   AccessChain 475 313 313
+             717:   18(fvec4)   Load 716
+             718:   73(fvec3)   VectorShuffle 717 717 0 1 2
+             719:   73(fvec3)   Load 512(fragPos)
+             720:   73(fvec3)   FSub 718 719
+                                Store 710(V) 720
+             722:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 723 723 16 16
+             721:   73(fvec3)   Load 710(V)
+             724:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 721
+                                Store 710(V) 724
+             730:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 728 728 16 16
+             729:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 726 725(lightCosInnerAngle) 49
+                                Store 725(lightCosInnerAngle) 731
+             737:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 735 735 16 16
+             736:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 733 732(lightCosOuterAngle) 49
+                                Store 732(lightCosOuterAngle) 738
+             744:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 742 742 16 16
+             743:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 740 739(lightRange) 49
+                                Store 739(lightRange) 745
+             751:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 749 749 16 16
+             750:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 747 746(dir) 49
+             752:    233(int)   Load 668(i)
+             753:    692(ptr)   AccessChain 475 313 320 752 313
+             754:   18(fvec4)   Load 753
+             755:   73(fvec3)   VectorShuffle 754 754 0 1 2
+             756:    233(int)   Load 668(i)
+             757:    692(ptr)   AccessChain 475 313 320 756 320
+             758:   18(fvec4)   Load 757
+             759:   73(fvec3)   VectorShuffle 758 758 0 1 2
+             760:   73(fvec3)   FSub 755 759
+             761:   73(fvec3)   ExtInst 3(GLSL.std.450) 69(Normalize) 760
+                                Store 746(dir) 761
+             767:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 765 765 16 16
+             766:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 763 762(cosDir) 49
+             768:   73(fvec3)   Load 684(L)
+             769:   73(fvec3)   Load 746(dir)
+             770:    8(float)   Dot 768 769
+                                Store 762(cosDir) 770
+             776:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 774 774 16 16
+             775:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 772 771(spotEffect) 49
+             777:    8(float)   Load 732(lightCosOuterAngle)
+             778:    8(float)   Load 725(lightCosInnerAngle)
+             779:    8(float)   Load 762(cosDir)
+             780:    8(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 777 778 779
+                                Store 771(spotEffect) 780
+             786:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 784 784 16 16
+             785:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 782 781(heightAttenuation) 49
+             787:    8(float)   Load 739(lightRange)
+             788:    8(float)   Load 699(dist)
+             789:    8(float)   ExtInst 3(GLSL.std.450) 49(SmoothStep) 787 198 788
+                                Store 781(heightAttenuation) 789
+             795:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 793 793 16 16
+             794:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 791 790(NdotL) 49
+             796:   73(fvec3)   Load 660(N)
+             797:   73(fvec3)   Load 684(L)
+             798:    8(float)   Dot 796 797
+             799:    8(float)   ExtInst 3(GLSL.std.450) 40(FMax) 198 798
+                                Store 790(NdotL) 799
+             805:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 803 803 16 16
+             804:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 801 800(diff) 49
+             806:    8(float)   Load 790(NdotL)
+             807:   73(fvec3)   CompositeConstruct 806 806 806
+                                Store 800(diff) 807
+             813:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 811 811 16 16
+             812:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 809 808(R) 49
+             814:   73(fvec3)   Load 684(L)
+             815:   73(fvec3)   FNegate 814
+             816:   73(fvec3)   Load 660(N)
+             817:   73(fvec3)   ExtInst 3(GLSL.std.450) 71(Reflect) 815 816
+                                Store 808(R) 817
+             823:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 821 821 16 16
+             822:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 819 818(NdotR) 49
+             824:   73(fvec3)   Load 808(R)
+             825:   73(fvec3)   Load 710(V)
+             826:    8(float)   Dot 824 825
+             827:    8(float)   ExtInst 3(GLSL.std.450) 40(FMax) 198 826
+                                Store 818(NdotR) 827
+             833:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 831 831 16 16
+             832:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 829 828(spec) 49
+             834:    8(float)   Load 818(NdotR)
+             836:    8(float)   ExtInst 3(GLSL.std.450) 26(Pow) 834 835
+             837:     24(ptr)   AccessChain 555(albedo) 17
+             838:    8(float)   Load 837
+             839:    8(float)   FMul 836 838
+             841:    8(float)   FMul 839 840
+             842:   73(fvec3)   CompositeConstruct 841 841 841
+                                Store 828(spec) 842
+             844:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 845 845 16 16
+             843:   73(fvec3)   Load 800(diff)
+             846:   73(fvec3)   Load 828(spec)
+             847:   73(fvec3)   FAdd 843 846
+             848:    8(float)   Load 771(spotEffect)
+             849:   73(fvec3)   VectorTimesScalar 847 848
+             850:    8(float)   Load 781(heightAttenuation)
+             851:   73(fvec3)   VectorTimesScalar 849 850
+             852:    233(int)   Load 668(i)
+             854:    692(ptr)   AccessChain 475 313 320 852 853
+             855:   18(fvec4)   Load 854
+             856:   73(fvec3)   VectorShuffle 855 855 0 1 2
+             857:   73(fvec3)   FMul 851 856
+             858:   18(fvec4)   Load 555(albedo)
+             859:   73(fvec3)   VectorShuffle 858 858 0 1 2
+             860:   73(fvec3)   FMul 857 859
+             861:   73(fvec3)   Load 593(fragcolor)
+             862:   73(fvec3)   FAdd 861 860
+                                Store 593(fragcolor) 862
+                                Branch 676
+             676:               Label
+             864:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             865:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 670 670 16 16
+             863:    233(int)   Load 668(i)
+             866:    233(int)   IAdd 863 320
+                                Store 668(i) 866
+                                Branch 673
+             675:             Label
+             868:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             869:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 870 870 16 16
+             867:    573(ptr) AccessChain 475 313 853
+             871:    233(int) Load 867
+             872:   140(bool) SGreaterThan 871 313
+                              SelectionMerge 874 None
+                              BranchConditional 872 873 874
+             873:               Label
+             877:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             878:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 879 879 16 16
+             876:   73(fvec3)   Load 593(fragcolor)
+                                Store 875(param) 876
+             881:   73(fvec3)   Load 512(fragPos)
+                                Store 880(param) 881
+             882:   73(fvec3)   FunctionCall 81(shadow(vf3;vf3;) 875(param) 880(param)
+                                Store 593(fragcolor) 882
+                                Branch 874
+             874:             Label
+             884:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 99
+             885:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 40 886 886 16 16
+             883:   73(fvec3) Load 593(fragcolor)
+             887:    8(float) CompositeExtract 883 0
+             888:    8(float) CompositeExtract 883 1
+             889:    8(float) CompositeExtract 883 2
+             890:   18(fvec4) CompositeConstruct 887 888 889 111
+                              ReturnValue 890
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.geom.out b/Test/baseResults/spv.debuginfo.hlsl.geom.out
index 2647753e..1ba94470 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.geom.out
@@ -1,20 +1,20 @@
 spv.debuginfo.hlsl.geom
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 367
+// Id's are bound by 366
 
                               Capability Geometry
                               Capability MultiViewport
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Geometry 6  "main" 267 274 279 286 291 296 301 316 323 328 352 355
+                              EntryPoint Geometry 6  "main" 264 273 278 285 290 295 300 315 322 327 351 354
                               ExecutionMode 6 Triangles
                               ExecutionMode 6 Invocations 2
                               ExecutionMode 6 OutputTriangleStrip
                               ExecutionMode 6 OutputVertices 3
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               25:             String  "Pos"
@@ -33,28 +33,28 @@ spv.debuginfo.hlsl.geom
               54:             String  "LightVec"
               60:             String  "GSOutput"
               73:             String  "@main"
-              79:             String  "input"
+              77:             String  "input"
               83:             String  "outStream"
               87:             String  "InvocationID"
-              96:             String  "int"
-             102:             String  "i"
-             117:             String  "bool"
-             125:             String  "output"
-             148:             String  "projection"
-             152:             String  "modelview"
-             156:             String  "lightPos"
-             160:             String  "UBO"
-             163:             String  "ubo"
-             201:             String  "pos"
-             210:             String  "worldPos"
-             221:             String  "lPos"
-             269:             String  "outStream.Pos"
-             276:             String  "outStream.ViewportIndex"
-             281:             String  "outStream.PrimitiveID"
-             288:             String  "outStream.Normal"
-             293:             String  "outStream.Color"
-             298:             String  "outStream.ViewVec"
-             303:             String  "outStream.LightVec"
+              93:             String  "int"
+              99:             String  "i"
+             116:             String  "bool"
+             121:             String  "output"
+             147:             String  "projection"
+             151:             String  "modelview"
+             155:             String  "lightPos"
+             159:             String  "UBO"
+             162:             String  "ubo"
+             198:             String  "pos"
+             207:             String  "worldPos"
+             218:             String  "lPos"
+             266:             String  "outStream.Pos"
+             275:             String  "outStream.ViewportIndex"
+             280:             String  "outStream.PrimitiveID"
+             287:             String  "outStream.Normal"
+             292:             String  "outStream.Color"
+             297:             String  "outStream.ViewVec"
+             302:             String  "outStream.LightVec"
                               Name 6  "main"
                               Name 23  "VSOutput"
                               MemberName 23(VSOutput) 0  "Pos"
@@ -73,63 +73,63 @@ spv.debuginfo.hlsl.geom
                               Name 68  "outStream"
                               Name 69  "InvocationID"
                               Name 70  "PrimitiveID"
-                              Name 100  "i"
-                              Name 123  "output"
-                              Name 146  "UBO"
-                              MemberName 146(UBO) 0  "projection"
-                              MemberName 146(UBO) 1  "modelview"
-                              MemberName 146(UBO) 2  "lightPos"
-                              Name 161  "ubo"
-                              MemberName 161(ubo) 0  "ubo"
-                              Name 168  ""
-                              Name 199  "pos"
-                              Name 208  "worldPos"
-                              Name 219  "lPos"
-                              Name 267  "outStream.Pos"
-                              Name 274  "outStream.ViewportIndex"
-                              Name 279  "outStream.PrimitiveID"
-                              Name 286  "outStream.Normal"
-                              Name 291  "outStream.Color"
-                              Name 296  "outStream.ViewVec"
-                              Name 301  "outStream.LightVec"
-                              Name 313  "input"
-                              Name 316  "input.Pos"
-                              Name 323  "input.Normal"
-                              Name 328  "input.Color"
-                              Name 350  "InvocationID"
-                              Name 352  "InvocationID"
+                              Name 97  "i"
+                              Name 119  "output"
+                              Name 145  "UBO"
+                              MemberName 145(UBO) 0  "projection"
+                              MemberName 145(UBO) 1  "modelview"
+                              MemberName 145(UBO) 2  "lightPos"
+                              Name 160  "ubo"
+                              MemberName 160(ubo) 0  "ubo"
+                              Name 167  ""
+                              Name 196  "pos"
+                              Name 205  "worldPos"
+                              Name 216  "lPos"
+                              Name 264  "outStream.Pos"
+                              Name 273  "outStream.ViewportIndex"
+                              Name 278  "outStream.PrimitiveID"
+                              Name 285  "outStream.Normal"
+                              Name 290  "outStream.Color"
+                              Name 295  "outStream.ViewVec"
+                              Name 300  "outStream.LightVec"
+                              Name 312  "input"
+                              Name 315  "input.Pos"
+                              Name 322  "input.Normal"
+                              Name 327  "input.Color"
+                              Name 349  "InvocationID"
+                              Name 351  "InvocationID"
+                              Name 353  "PrimitiveID"
                               Name 354  "PrimitiveID"
-                              Name 355  "PrimitiveID"
-                              Name 357  "outStream"
-                              Name 358  "param"
+                              Name 356  "outStream"
+                              Name 357  "param"
+                              Name 359  "param"
                               Name 360  "param"
-                              Name 361  "param"
-                              Name 363  "param"
-                              Decorate 142 ArrayStride 64
-                              Decorate 144 ArrayStride 64
-                              MemberDecorate 146(UBO) 0 RowMajor
-                              MemberDecorate 146(UBO) 0 Offset 0
-                              MemberDecorate 146(UBO) 0 MatrixStride 16
-                              MemberDecorate 146(UBO) 1 RowMajor
-                              MemberDecorate 146(UBO) 1 Offset 128
-                              MemberDecorate 146(UBO) 1 MatrixStride 16
-                              MemberDecorate 146(UBO) 2 Offset 256
-                              MemberDecorate 161(ubo) 0 Offset 0
-                              Decorate 161(ubo) Block
-                              Decorate 168 DescriptorSet 0
-                              Decorate 168 Binding 0
-                              Decorate 267(outStream.Pos) BuiltIn Position
-                              Decorate 274(outStream.ViewportIndex) BuiltIn ViewportIndex
-                              Decorate 279(outStream.PrimitiveID) BuiltIn PrimitiveId
-                              Decorate 286(outStream.Normal) Location 0
-                              Decorate 291(outStream.Color) Location 1
-                              Decorate 296(outStream.ViewVec) Location 2
-                              Decorate 301(outStream.LightVec) Location 3
-                              Decorate 316(input.Pos) BuiltIn Position
-                              Decorate 323(input.Normal) Location 0
-                              Decorate 328(input.Color) Location 1
-                              Decorate 352(InvocationID) BuiltIn InvocationId
-                              Decorate 355(PrimitiveID) BuiltIn PrimitiveId
+                              Name 362  "param"
+                              Decorate 141 ArrayStride 64
+                              Decorate 143 ArrayStride 64
+                              MemberDecorate 145(UBO) 0 RowMajor
+                              MemberDecorate 145(UBO) 0 Offset 0
+                              MemberDecorate 145(UBO) 0 MatrixStride 16
+                              MemberDecorate 145(UBO) 1 RowMajor
+                              MemberDecorate 145(UBO) 1 Offset 128
+                              MemberDecorate 145(UBO) 1 MatrixStride 16
+                              MemberDecorate 145(UBO) 2 Offset 256
+                              MemberDecorate 160(ubo) 0 Offset 0
+                              Decorate 160(ubo) Block
+                              Decorate 167 DescriptorSet 0
+                              Decorate 167 Binding 0
+                              Decorate 264(outStream.Pos) BuiltIn Position
+                              Decorate 273(outStream.ViewportIndex) BuiltIn ViewportIndex
+                              Decorate 278(outStream.PrimitiveID) BuiltIn PrimitiveId
+                              Decorate 285(outStream.Normal) Location 0
+                              Decorate 290(outStream.Color) Location 1
+                              Decorate 295(outStream.ViewVec) Location 2
+                              Decorate 300(outStream.LightVec) Location 3
+                              Decorate 315(input.Pos) BuiltIn Position
+                              Decorate 322(input.Normal) Location 0
+                              Decorate 327(input.Color) Location 1
+                              Decorate 351(InvocationID) BuiltIn InvocationId
+                              Decorate 354(PrimitiveID) BuiltIn PrimitiveId
                4:             TypeVoid
                5:             TypeFunction 4
                8:             TypeFloat 32
@@ -137,377 +137,373 @@ spv.debuginfo.hlsl.geom
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:             TypeVector 8(float) 4
               19:     11(int) Constant 4
-              20:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
+              20:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
               21:             TypeVector 8(float) 3
-              22:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+              22:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
     23(VSOutput):             TypeStruct 18(fvec4) 21(fvec3) 21(fvec3)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 27
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 27
               28:     11(int) Constant 37
               29:     11(int) Constant 13
-              24:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 25 20 26 28 29 16 16 17
+              24:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 25 20 26 28 29 16 16 17
               32:     11(int) Constant 39
               33:     11(int) Constant 34
-              30:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 31 22 26 32 33 16 16 17
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 31 22 26 32 33 16 16 17
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 31 22 26 32 33 16 16 17
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 31 22 26 32 33 16 16 17
               37:     11(int) Constant 1
               39:     11(int) Constant 5
-              38:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 37 19 26 39
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 36 37 26 16 16 38 36 16 17 24 30 34
+              38:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 37 19 26 39
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 36 37 26 16 16 38 36 16 17 24 30 34
               40:             TypeArray 23(VSOutput) 17
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 35 17
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 35 17
               42:             TypePointer Function 40
               43:     11(int) Constant 7
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 41 43 16
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 41 43 16
     45(GSOutput):             TypeStruct 18(fvec4) 11(int) 11(int) 21(fvec3) 21(fvec3) 21(fvec3) 21(fvec3)
               47:     11(int) Constant 44
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 25 20 26 47 29 16 16 17
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 25 20 26 47 29 16 16 17
               50:     11(int) Constant 46
               51:     11(int) Constant 19
-              48:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 49 13 26 50 51 16 16 17
-              52:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 49 13 26 50 51 16 16 17
+              48:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 49 13 26 50 51 16 16 17
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 49 13 26 50 51 16 16 17
               55:     11(int) Constant 50
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
-              58:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 60 37 26 16 16 38 60 16 17 46 48 52 53 56 57 58
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
+              58:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 54 22 26 55 28 16 16 17
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 60 37 26 16 16 38 60 16 17 46 48 52 53 56 57 58
               61:             TypePointer Function 45(GSOutput)
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 43 16
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 43 16
               63:             TypePointer Function 11(int)
-              64:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 43 16
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 43 16
               65:             TypeFunction 4 42(ptr) 61(ptr) 63(ptr) 63(ptr)
-              66:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 4 41 59 13 13
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 4 41 59 13 13
               75:     11(int) Constant 56
-              74:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 73 66 26 75 16 38 73 17 75
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 79 41 26 75 16 74 19 37
-              81:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 73 66 26 75 16 38 73 17 75
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 77 41 26 75 16 74 19 37
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
               84:     11(int) Constant 2
-              82:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 83 59 26 75 16 74 19 84
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 13 26 75 16 74 19 17
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 13 26 75 16 74 19 19
-              94:     11(int) Constant 57
-              95:             TypeInt 32 1
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 96 14 19 16
-              98:             TypePointer Function 95(int)
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 97 43 16
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 102 97 26 94 16 74 19
-             104:     95(int) Constant 0
-             115:     95(int) Constant 3
-             116:             TypeBool
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 117 14 84 16
+              82:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 83 59 26 75 16 74 19 84
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 87 13 26 75 16 74 19 17
+              89:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 49 13 26 75 16 74 19 19
+              92:             TypeInt 32 1
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 93 14 19 16
+              95:             TypePointer Function 92(int)
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 94 43 16
+             100:     11(int) Constant 57
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 99 94 26 100 16 74 19
+             103:     92(int) Constant 0
+             114:     92(int) Constant 3
+             115:             TypeBool
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 116 14 84 16
              122:     11(int) Constant 59
-             124:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 125 59 26 122 16 74 19
-             127:    8(float) Constant 0
-             128:   18(fvec4) ConstantComposite 127 127 127 127
-             129:   21(fvec3) ConstantComposite 127 127 127
-             130:45(GSOutput) ConstantComposite 128 16 16 129 129 129 129
+             120:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 121 59 26 122 16 74 19
+             126:    8(float) Constant 0
+             127:   18(fvec4) ConstantComposite 126 126 126 126
+             128:   21(fvec3) ConstantComposite 126 126 126
+             129:45(GSOutput) ConstantComposite 127 16 16 128 128 128 128
              132:     11(int) Constant 60
-             134:     95(int) Constant 1
-             135:             TypePointer Function 21(fvec3)
-             136:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 43 16
-             139:             TypeMatrix 18(fvec4) 4
-             141:   116(bool) ConstantTrue
-             140:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 141
-             142:             TypeArray 139 84
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 140 84
-             144:             TypeArray 139 84
-             145:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 140 84
-        146(UBO):             TypeStruct 142 144 18(fvec4)
-             149:     11(int) Constant 28
-             150:     11(int) Constant 21
-             147:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 148 143 26 149 150 16 16 17
-             153:     11(int) Constant 29
-             154:     11(int) Constant 20
-             151:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 152 145 26 153 154 16 16 17
-             157:     11(int) Constant 30
-             158:     11(int) Constant 17
-             155:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 156 20 26 157 158 16 16 17
-             159:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 160 37 26 132 16 38 160 16 17 147 151 155
-        161(ubo):             TypeStruct 146(UBO)
-             164:     11(int) Constant 33
-             162:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 163 159 26 164 28 16 16 17
-             165:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 163 37 26 132 16 38 163 16 17 162
-             166:             TypePointer Uniform 161(ubo)
-             167:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 165 84 16
-             168:    166(ptr) Variable Uniform
-             170:     11(int) Constant 8
-             169:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 165 26 132 16 38 1 168 170
-             172:             TypePointer Uniform 139
-             173:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 140 84 16
-             176:             TypeMatrix 21(fvec3) 3
-             177:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 22 17 141
-             188:     11(int) Constant 61
-             189:     95(int) Constant 4
-             191:     95(int) Constant 2
-             196:     11(int) Constant 63
-             197:             TypePointer Function 18(fvec4)
-             198:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 43 16
-             200:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 201 20 26 196 16 74 19
-             207:     11(int) Constant 64
-             209:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 210 20 26 207 16 74 19
-             218:     11(int) Constant 66
-             220:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 221 22 26 218 16 74 19
-             223:             TypePointer Uniform 18(fvec4)
-             224:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 84 16
-             233:     11(int) Constant 67
-             234:     95(int) Constant 6
-             241:     11(int) Constant 68
-             242:     95(int) Constant 5
+             133:     92(int) Constant 1
+             134:             TypePointer Function 21(fvec3)
+             135:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 43 16
+             138:             TypeMatrix 18(fvec4) 4
+             140:   115(bool) ConstantTrue
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 140
+             141:             TypeArray 138 84
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 139 84
+             143:             TypeArray 138 84
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 139 84
+        145(UBO):             TypeStruct 141 143 18(fvec4)
+             148:     11(int) Constant 28
+             149:     11(int) Constant 21
+             146:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 147 142 26 148 149 16 16 17
+             152:     11(int) Constant 29
+             153:     11(int) Constant 20
+             150:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 151 144 26 152 153 16 16 17
+             156:     11(int) Constant 30
+             157:     11(int) Constant 17
+             154:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 155 20 26 156 157 16 16 17
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 159 37 26 132 16 38 159 16 17 146 150 154
+        160(ubo):             TypeStruct 145(UBO)
+             163:     11(int) Constant 33
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 162 158 26 163 28 16 16 17
+             164:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 162 37 26 132 16 38 162 16 17 161
+             165:             TypePointer Uniform 160(ubo)
+             166:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 164 84 16
+             167:    165(ptr) Variable Uniform
+             169:     11(int) Constant 8
+             168:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 164 26 132 16 38 2 167 169
+             171:             TypePointer Uniform 138
+             172:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 139 84 16
+             175:             TypeMatrix 21(fvec3) 3
+             176:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 22 17 140
+             186:     92(int) Constant 4
+             189:     11(int) Constant 61
+             190:     92(int) Constant 2
+             194:             TypePointer Function 18(fvec4)
+             195:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 43 16
+             199:     11(int) Constant 63
+             197:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 198 20 26 199 16 74 19
+             208:     11(int) Constant 64
+             206:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 207 20 26 208 16 74 19
+             219:     11(int) Constant 66
+             217:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 218 22 26 219 16 74 19
+             222:             TypePointer Uniform 18(fvec4)
+             223:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 84 16
+             231:     92(int) Constant 6
+             234:     11(int) Constant 67
+             239:     92(int) Constant 5
+             242:     11(int) Constant 68
              248:     11(int) Constant 70
              256:     11(int) Constant 73
              260:     11(int) Constant 74
-             264:     11(int) Constant 75
-             265:             TypePointer Output 18(fvec4)
-             266:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 17 16
-267(outStream.Pos):    265(ptr) Variable Output
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 269 20 26 264 16 38 269 267(outStream.Pos) 170
-             272:             TypePointer Output 11(int)
-             273:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 17 16
-274(outStream.ViewportIndex):    272(ptr) Variable Output
-             275:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 276 13 26 264 16 38 276 274(outStream.ViewportIndex) 170
-279(outStream.PrimitiveID):    272(ptr) Variable Output
-             280:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 281 13 26 264 16 38 281 279(outStream.PrimitiveID) 170
-             284:             TypePointer Output 21(fvec3)
-             285:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 17 16
-286(outStream.Normal):    284(ptr) Variable Output
-             287:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 288 22 26 264 16 38 288 286(outStream.Normal) 170
-291(outStream.Color):    284(ptr) Variable Output
-             292:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 293 22 26 264 16 38 293 291(outStream.Color) 170
-296(outStream.ViewVec):    284(ptr) Variable Output
-             297:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 298 22 26 264 16 38 298 296(outStream.ViewVec) 170
-301(outStream.LightVec):    284(ptr) Variable Output
-             302:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 303 22 26 264 16 38 303 301(outStream.LightVec) 170
-             312:     11(int) Constant 78
-             314:             TypeArray 18(fvec4) 17
-             315:             TypePointer Input 314
-  316(input.Pos):    315(ptr) Variable Input
-             317:             TypePointer Input 18(fvec4)
-             321:             TypeArray 21(fvec3) 17
-             322:             TypePointer Input 321
-323(input.Normal):    322(ptr) Variable Input
-             324:             TypePointer Input 21(fvec3)
-328(input.Color):    322(ptr) Variable Input
-             351:             TypePointer Input 11(int)
-352(InvocationID):    351(ptr) Variable Input
-355(PrimitiveID):    351(ptr) Variable Input
-                              Line 1 56 1
+             262:             TypePointer Output 18(fvec4)
+             263:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 17 16
+264(outStream.Pos):    262(ptr) Variable Output
+             267:     11(int) Constant 75
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 266 20 26 267 16 38 266 264(outStream.Pos) 169
+             271:             TypePointer Output 11(int)
+             272:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 17 16
+273(outStream.ViewportIndex):    271(ptr) Variable Output
+             274:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 275 13 26 267 16 38 275 273(outStream.ViewportIndex) 169
+278(outStream.PrimitiveID):    271(ptr) Variable Output
+             279:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 280 13 26 267 16 38 280 278(outStream.PrimitiveID) 169
+             283:             TypePointer Output 21(fvec3)
+             284:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 17 16
+285(outStream.Normal):    283(ptr) Variable Output
+             286:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 287 22 26 267 16 38 287 285(outStream.Normal) 169
+290(outStream.Color):    283(ptr) Variable Output
+             291:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 292 22 26 267 16 38 292 290(outStream.Color) 169
+295(outStream.ViewVec):    283(ptr) Variable Output
+             296:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 297 22 26 267 16 38 297 295(outStream.ViewVec) 169
+300(outStream.LightVec):    283(ptr) Variable Output
+             301:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 302 22 26 267 16 38 302 300(outStream.LightVec) 169
+             311:     11(int) Constant 78
+             313:             TypeArray 18(fvec4) 17
+             314:             TypePointer Input 313
+  315(input.Pos):    314(ptr) Variable Input
+             316:             TypePointer Input 18(fvec4)
+             320:             TypeArray 21(fvec3) 17
+             321:             TypePointer Input 320
+322(input.Normal):    321(ptr) Variable Input
+             323:             TypePointer Input 21(fvec3)
+327(input.Color):    321(ptr) Variable Input
+             350:             TypePointer Input 11(int)
+351(InvocationID):    350(ptr) Variable Input
+354(PrimitiveID):    350(ptr) Variable Input
          6(main):           4 Function None 5
                7:             Label
-      313(input):     42(ptr) Variable Function
-350(InvocationID):     63(ptr) Variable Function
-354(PrimitiveID):     63(ptr) Variable Function
-  357(outStream):     61(ptr) Variable Function
-      358(param):     42(ptr) Variable Function
-      360(param):     61(ptr) Variable Function
-      361(param):     63(ptr) Variable Function
-      363(param):     63(ptr) Variable Function
-                              Line 1 56 0
-             318:    317(ptr) AccessChain 316(input.Pos) 104
-             319:   18(fvec4) Load 318
-             320:    197(ptr) AccessChain 313(input) 104 104
-                              Store 320 319
-             325:    324(ptr) AccessChain 323(input.Normal) 104
-             326:   21(fvec3) Load 325
-             327:    135(ptr) AccessChain 313(input) 104 134
-                              Store 327 326
-             329:    324(ptr) AccessChain 328(input.Color) 104
-             330:   21(fvec3) Load 329
-             331:    135(ptr) AccessChain 313(input) 104 191
-                              Store 331 330
-             332:    317(ptr) AccessChain 316(input.Pos) 134
-             333:   18(fvec4) Load 332
-             334:    197(ptr) AccessChain 313(input) 134 104
-                              Store 334 333
-             335:    324(ptr) AccessChain 323(input.Normal) 134
-             336:   21(fvec3) Load 335
-             337:    135(ptr) AccessChain 313(input) 134 134
-                              Store 337 336
-             338:    324(ptr) AccessChain 328(input.Color) 134
-             339:   21(fvec3) Load 338
-             340:    135(ptr) AccessChain 313(input) 134 191
-                              Store 340 339
-             341:    317(ptr) AccessChain 316(input.Pos) 191
-             342:   18(fvec4) Load 341
-             343:    197(ptr) AccessChain 313(input) 191 104
-                              Store 343 342
-             344:    324(ptr) AccessChain 323(input.Normal) 191
-             345:   21(fvec3) Load 344
-             346:    135(ptr) AccessChain 313(input) 191 134
-                              Store 346 345
-             347:    324(ptr) AccessChain 328(input.Color) 191
-             348:   21(fvec3) Load 347
-             349:    135(ptr) AccessChain 313(input) 191 191
-                              Store 349 348
-             353:     11(int) Load 352(InvocationID)
-                              Store 350(InvocationID) 353
-             356:     11(int) Load 355(PrimitiveID)
-                              Store 354(PrimitiveID) 356
-             359:          40 Load 313(input)
-                              Store 358(param) 359
-             362:     11(int) Load 350(InvocationID)
-                              Store 361(param) 362
-             364:     11(int) Load 354(PrimitiveID)
-                              Store 363(param) 364
-             365:           4 FunctionCall 71(@main(struct-VSOutput-vf4-vf3-vf31[3];struct-GSOutput-vf4-u1-u1-vf3-vf3-vf3-vf31;u1;u1;) 358(param) 360(param) 361(param) 363(param)
-             366:45(GSOutput) Load 360(param)
-                              Store 357(outStream) 366
+      312(input):     42(ptr) Variable Function
+349(InvocationID):     63(ptr) Variable Function
+353(PrimitiveID):     63(ptr) Variable Function
+  356(outStream):     61(ptr) Variable Function
+      357(param):     42(ptr) Variable Function
+      359(param):     61(ptr) Variable Function
+      360(param):     63(ptr) Variable Function
+      362(param):     63(ptr) Variable Function
+             317:    316(ptr) AccessChain 315(input.Pos) 103
+             318:   18(fvec4) Load 317
+             319:    194(ptr) AccessChain 312(input) 103 103
+                              Store 319 318
+             324:    323(ptr) AccessChain 322(input.Normal) 103
+             325:   21(fvec3) Load 324
+             326:    134(ptr) AccessChain 312(input) 103 133
+                              Store 326 325
+             328:    323(ptr) AccessChain 327(input.Color) 103
+             329:   21(fvec3) Load 328
+             330:    134(ptr) AccessChain 312(input) 103 190
+                              Store 330 329
+             331:    316(ptr) AccessChain 315(input.Pos) 133
+             332:   18(fvec4) Load 331
+             333:    194(ptr) AccessChain 312(input) 133 103
+                              Store 333 332
+             334:    323(ptr) AccessChain 322(input.Normal) 133
+             335:   21(fvec3) Load 334
+             336:    134(ptr) AccessChain 312(input) 133 133
+                              Store 336 335
+             337:    323(ptr) AccessChain 327(input.Color) 133
+             338:   21(fvec3) Load 337
+             339:    134(ptr) AccessChain 312(input) 133 190
+                              Store 339 338
+             340:    316(ptr) AccessChain 315(input.Pos) 190
+             341:   18(fvec4) Load 340
+             342:    194(ptr) AccessChain 312(input) 190 103
+                              Store 342 341
+             343:    323(ptr) AccessChain 322(input.Normal) 190
+             344:   21(fvec3) Load 343
+             345:    134(ptr) AccessChain 312(input) 190 133
+                              Store 345 344
+             346:    323(ptr) AccessChain 327(input.Color) 190
+             347:   21(fvec3) Load 346
+             348:    134(ptr) AccessChain 312(input) 190 190
+                              Store 348 347
+             352:     11(int) Load 351(InvocationID)
+                              Store 349(InvocationID) 352
+             355:     11(int) Load 354(PrimitiveID)
+                              Store 353(PrimitiveID) 355
+             358:          40 Load 312(input)
+                              Store 357(param) 358
+             361:     11(int) Load 349(InvocationID)
+                              Store 360(param) 361
+             363:     11(int) Load 353(PrimitiveID)
+                              Store 362(param) 363
+             364:           4 FunctionCall 71(@main(struct-VSOutput-vf4-vf3-vf31[3];struct-GSOutput-vf4-u1-u1-vf3-vf3-vf3-vf31;u1;u1;) 357(param) 359(param) 360(param) 362(param)
+             365:45(GSOutput) Load 359(param)
+                              Store 356(outStream) 365
                               Return
                               FunctionEnd
-                              Line 1 56 1
 71(@main(struct-VSOutput-vf4-vf3-vf31[3];struct-GSOutput-vf4-u1-u1-vf3-vf3-vf3-vf31;u1;u1;):           4 Function None 65
        67(input):     42(ptr) FunctionParameter
    68(outStream):     61(ptr) FunctionParameter
 69(InvocationID):     63(ptr) FunctionParameter
  70(PrimitiveID):     63(ptr) FunctionParameter
               72:             Label
-          100(i):     98(ptr) Variable Function
-     123(output):     61(ptr) Variable Function
-        199(pos):    197(ptr) Variable Function
-   208(worldPos):    197(ptr) Variable Function
-       219(lPos):    135(ptr) Variable Function
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 75 75 16 16
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 78 67(input) 81
-              85:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 82 68(outStream) 81
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 86 69(InvocationID) 81
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 89 70(PrimitiveID) 81
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 74 71(@main(struct-VSOutput-vf4-vf3-vf31[3];struct-GSOutput-vf4-u1-u1-vf3-vf3-vf3-vf31;u1;u1;)
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-              93:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 94 94 16 16
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 101 100(i) 81
-                              Store 100(i) 104
-                              Branch 105
-             105:             Label
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-             110:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 94 94 16 16
-                              LoopMerge 107 108 None
-                              Branch 111
-             111:             Label
-             112:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-             113:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 94 94 16 16
-             114:     95(int) Load 100(i)
-             119:   116(bool) SLessThan 114 115
-                              BranchConditional 119 106 107
-             106:               Label
-             120:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-             121:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 122 122 16 16
-             126:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 124 123(output) 81
-                                Store 123(output) 130
-             131:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 132 132 16 16
-             133:     95(int)   Load 100(i)
-             137:    135(ptr)   AccessChain 67(input) 133 134
-             138:   21(fvec3)   Load 137
-             171:     11(int)   Load 69(InvocationID)
-             174:    172(ptr)   AccessChain 168 104 134 171
-             175:         139   Load 174
-             178:   18(fvec4)   CompositeExtract 175 0
-             179:   21(fvec3)   VectorShuffle 178 178 0 1 2
-             180:   18(fvec4)   CompositeExtract 175 1
-             181:   21(fvec3)   VectorShuffle 180 180 0 1 2
-             182:   18(fvec4)   CompositeExtract 175 2
-             183:   21(fvec3)   VectorShuffle 182 182 0 1 2
-             184:         176   CompositeConstruct 179 181 183
-             185:   21(fvec3)   VectorTimesMatrix 138 184
-             186:    135(ptr)   AccessChain 123(output) 115
-                                Store 186 185
-             187:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 188 188 16 16
-             190:     95(int)   Load 100(i)
-             192:    135(ptr)   AccessChain 67(input) 190 191
-             193:   21(fvec3)   Load 192
-             194:    135(ptr)   AccessChain 123(output) 189
-                                Store 194 193
-             195:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 196 196 16 16
-             202:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 200 199(pos) 81
-             203:     95(int)   Load 100(i)
-             204:    197(ptr)   AccessChain 67(input) 203 104
-             205:   18(fvec4)   Load 204
-                                Store 199(pos) 205
-             206:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 207 207 16 16
-             211:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 209 208(worldPos) 81
-             212:   18(fvec4)   Load 199(pos)
-             213:     11(int)   Load 69(InvocationID)
-             214:    172(ptr)   AccessChain 168 104 134 213
-             215:         139   Load 214
-             216:   18(fvec4)   VectorTimesMatrix 212 215
-                                Store 208(worldPos) 216
-             217:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 218 218 16 16
-             222:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 220 219(lPos) 81
-             225:    223(ptr)   AccessChain 168 104 191
-             226:   18(fvec4)   Load 225
-             227:     11(int)   Load 69(InvocationID)
-             228:    172(ptr)   AccessChain 168 104 134 227
-             229:         139   Load 228
-             230:   18(fvec4)   VectorTimesMatrix 226 229
-             231:   21(fvec3)   VectorShuffle 230 230 0 1 2
-                                Store 219(lPos) 231
-             232:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 233 233 16 16
-             235:   21(fvec3)   Load 219(lPos)
-             236:   18(fvec4)   Load 208(worldPos)
-             237:   21(fvec3)   VectorShuffle 236 236 0 1 2
-             238:   21(fvec3)   FSub 235 237
-             239:    135(ptr)   AccessChain 123(output) 234
-                                Store 239 238
-             240:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 241 241 16 16
-             243:   18(fvec4)   Load 208(worldPos)
-             244:   21(fvec3)   VectorShuffle 243 243 0 1 2
-             245:   21(fvec3)   FNegate 244
-             246:    135(ptr)   AccessChain 123(output) 242
-                                Store 246 245
-             247:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 248 248 16 16
-             249:   18(fvec4)   Load 208(worldPos)
-             250:     11(int)   Load 69(InvocationID)
-             251:    172(ptr)   AccessChain 168 104 104 250
-             252:         139   Load 251
-             253:   18(fvec4)   VectorTimesMatrix 249 252
-             254:    197(ptr)   AccessChain 123(output) 104
-                                Store 254 253
-             255:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 256 256 16 16
-             257:     11(int)   Load 69(InvocationID)
-             258:     63(ptr)   AccessChain 123(output) 134
-                                Store 258 257
-             259:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 260 260 16 16
-             261:     11(int)   Load 70(PrimitiveID)
-             262:     63(ptr)   AccessChain 123(output) 191
-                                Store 262 261
-             263:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 264 264 16 16
-             270:    197(ptr)   AccessChain 123(output) 104
-             271:   18(fvec4)   Load 270
-                                Store 267(outStream.Pos) 271
-             277:     63(ptr)   AccessChain 123(output) 134
-             278:     11(int)   Load 277
-                                Store 274(outStream.ViewportIndex) 278
-             282:     63(ptr)   AccessChain 123(output) 191
-             283:     11(int)   Load 282
-                                Store 279(outStream.PrimitiveID) 283
-             289:    135(ptr)   AccessChain 123(output) 115
-             290:   21(fvec3)   Load 289
-                                Store 286(outStream.Normal) 290
-             294:    135(ptr)   AccessChain 123(output) 189
-             295:   21(fvec3)   Load 294
-                                Store 291(outStream.Color) 295
-             299:    135(ptr)   AccessChain 123(output) 242
-             300:   21(fvec3)   Load 299
-                                Store 296(outStream.ViewVec) 300
-             304:    135(ptr)   AccessChain 123(output) 234
-             305:   21(fvec3)   Load 304
-                                Store 301(outStream.LightVec) 305
+           97(i):     95(ptr) Variable Function
+     119(output):     61(ptr) Variable Function
+        196(pos):    194(ptr) Variable Function
+   205(worldPos):    194(ptr) Variable Function
+       216(lPos):    134(ptr) Variable Function
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+              81:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 75 75 16 16
+              78:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 76 67(input) 79
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 82 68(outStream) 79
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 86 69(InvocationID) 79
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 89 70(PrimitiveID) 79
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 74 71(@main(struct-VSOutput-vf4-vf3-vf31[3];struct-GSOutput-vf4-u1-u1-vf3-vf3-vf3-vf31;u1;u1;)
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 100 100 16 16
+             101:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 98 97(i) 79
+                              Store 97(i) 103
+                              Branch 104
+             104:             Label
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+             109:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 100 100 16 16
+                              LoopMerge 106 107 None
+                              Branch 110
+             110:             Label
+             112:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 100 100 16 16
+             111:     92(int) Load 97(i)
+             118:   115(bool) SLessThan 111 114
+                              BranchConditional 118 105 106
+             105:               Label
+             124:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+             125:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 122 122 16 16
+             123:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 120 119(output) 79
+                                Store 119(output) 129
+             131:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 132 132 16 16
+             130:     92(int)   Load 97(i)
+             136:    134(ptr)   AccessChain 67(input) 130 133
+             137:   21(fvec3)   Load 136
+             170:     11(int)   Load 69(InvocationID)
+             173:    171(ptr)   AccessChain 167 103 133 170
+             174:         138   Load 173
+             177:   18(fvec4)   CompositeExtract 174 0
+             178:   21(fvec3)   VectorShuffle 177 177 0 1 2
+             179:   18(fvec4)   CompositeExtract 174 1
+             180:   21(fvec3)   VectorShuffle 179 179 0 1 2
+             181:   18(fvec4)   CompositeExtract 174 2
+             182:   21(fvec3)   VectorShuffle 181 181 0 1 2
+             183:         175   CompositeConstruct 178 180 182
+             184:   21(fvec3)   VectorTimesMatrix 137 183
+             185:    134(ptr)   AccessChain 119(output) 114
+                                Store 185 184
+             188:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 189 189 16 16
+             187:     92(int)   Load 97(i)
+             191:    134(ptr)   AccessChain 67(input) 187 190
+             192:   21(fvec3)   Load 191
+             193:    134(ptr)   AccessChain 119(output) 186
+                                Store 193 192
+             201:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 199 199 16 16
+             200:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 197 196(pos) 79
+             202:     92(int)   Load 97(i)
+             203:    194(ptr)   AccessChain 67(input) 202 103
+             204:   18(fvec4)   Load 203
+                                Store 196(pos) 204
+             210:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 208 208 16 16
+             209:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 206 205(worldPos) 79
+             211:   18(fvec4)   Load 196(pos)
+             212:     11(int)   Load 69(InvocationID)
+             213:    171(ptr)   AccessChain 167 103 133 212
+             214:         138   Load 213
+             215:   18(fvec4)   VectorTimesMatrix 211 214
+                                Store 205(worldPos) 215
+             221:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 219 219 16 16
+             220:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 217 216(lPos) 79
+             224:    222(ptr)   AccessChain 167 103 190
+             225:   18(fvec4)   Load 224
+             226:     11(int)   Load 69(InvocationID)
+             227:    171(ptr)   AccessChain 167 103 133 226
+             228:         138   Load 227
+             229:   18(fvec4)   VectorTimesMatrix 225 228
+             230:   21(fvec3)   VectorShuffle 229 229 0 1 2
+                                Store 216(lPos) 230
+             233:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 234 234 16 16
+             232:   21(fvec3)   Load 216(lPos)
+             235:   18(fvec4)   Load 205(worldPos)
+             236:   21(fvec3)   VectorShuffle 235 235 0 1 2
+             237:   21(fvec3)   FSub 232 236
+             238:    134(ptr)   AccessChain 119(output) 231
+                                Store 238 237
+             241:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 242 242 16 16
+             240:   18(fvec4)   Load 205(worldPos)
+             243:   21(fvec3)   VectorShuffle 240 240 0 1 2
+             244:   21(fvec3)   FNegate 243
+             245:    134(ptr)   AccessChain 119(output) 239
+                                Store 245 244
+             247:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 248 248 16 16
+             246:   18(fvec4)   Load 205(worldPos)
+             249:     11(int)   Load 69(InvocationID)
+             250:    171(ptr)   AccessChain 167 103 103 249
+             251:         138   Load 250
+             252:   18(fvec4)   VectorTimesMatrix 246 251
+             253:    194(ptr)   AccessChain 119(output) 103
+                                Store 253 252
+             255:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 256 256 16 16
+             254:     11(int)   Load 69(InvocationID)
+             257:     63(ptr)   AccessChain 119(output) 133
+                                Store 257 254
+             259:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 260 260 16 16
+             258:     11(int)   Load 70(PrimitiveID)
+             261:     63(ptr)   AccessChain 119(output) 190
+                                Store 261 258
+             269:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 267 267 16 16
+             268:    194(ptr)   AccessChain 119(output) 103
+             270:   18(fvec4)   Load 268
+                                Store 264(outStream.Pos) 270
+             276:     63(ptr)   AccessChain 119(output) 133
+             277:     11(int)   Load 276
+                                Store 273(outStream.ViewportIndex) 277
+             281:     63(ptr)   AccessChain 119(output) 190
+             282:     11(int)   Load 281
+                                Store 278(outStream.PrimitiveID) 282
+             288:    134(ptr)   AccessChain 119(output) 114
+             289:   21(fvec3)   Load 288
+                                Store 285(outStream.Normal) 289
+             293:    134(ptr)   AccessChain 119(output) 186
+             294:   21(fvec3)   Load 293
+                                Store 290(outStream.Color) 294
+             298:    134(ptr)   AccessChain 119(output) 239
+             299:   21(fvec3)   Load 298
+                                Store 295(outStream.ViewVec) 299
+             303:    134(ptr)   AccessChain 119(output) 231
+             304:   21(fvec3)   Load 303
+                                Store 300(outStream.LightVec) 304
                                 EmitVertex
-                                Branch 108
-             108:               Label
-             306:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-             307:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 94 94 16 16
-             308:     95(int)   Load 100(i)
-             309:     95(int)   IAdd 308 134
-                                Store 100(i) 309
-                                Branch 105
-             107:             Label
-             310:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
-             311:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 312 312 16 16
+                                Branch 107
+             107:               Label
+             306:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+             307:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 100 100 16 16
+             305:     92(int)   Load 97(i)
+             308:     92(int)   IAdd 305 133
+                                Store 97(i) 308
+                                Branch 104
+             106:             Label
+             309:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 74
+             310:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 26 311 311 16 16
                               EndPrimitive
                               Return
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tesc.out b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
index e85d2d03..14f1e4b2 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
@@ -3,19 +3,19 @@ WARNING: 0:158: '' : attribute does not apply to entry point
 
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 702
+// Id's are bound by 705
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint TessellationControl 6  "main" 594 601 608 642 651 658 665 680 695
+                              EntryPoint TessellationControl 6  "main" 597 604 611 645 654 661 668 683 698
                               ExecutionMode 6 OutputVertices 4
                               ExecutionMode 6 Quads
                               ExecutionMode 6 SpacingEqual
                               ExecutionMode 6 VertexOrderCw
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               30:             String  "screenSpaceTessFactor"
@@ -28,47 +28,47 @@ WARNING: 0:158: '' : attribute does not apply to entry point
 // OpModuleProcessed hlsl-offsets
 #line 1
 "
-              41:             String  "p0"
+              39:             String  "p0"
               45:             String  "p1"
               53:             String  "bool"
               61:             String  "frustumCheck"
-              67:             String  "Pos"
-              70:             String  "inUV"
-              79:             String  "Normal"
-              83:             String  "UV"
-              87:             String  "VSOutput"
-              98:             String  "TessLevelOuter"
-             102:             String  "TessLevelInner"
-             105:             String  "ConstantsHSOutput"
-             111:             String  "ConstantsHS"
-             117:             String  "patch"
-             129:             String  "HSOutput"
-             136:             String  "@main"
-             144:             String  "InvocationID"
-             152:             String  "midPoint"
-             165:             String  "radius"
-             176:             String  "v0"
-             186:             String  "modelview"
-             191:             String  "lightPos"
-             195:             String  "frustumPlanes"
-             198:             String  "tessellatedEdgeSize"
-             202:             String  "viewportDim"
-             206:             String  "UBO"
-             209:             String  "ubo"
-             218:             String  "int"
-             231:             String  "clip0"
-             249:             String  "clip1"
-             326:             String  "pos"
-             333:             String  "type.2d.image"
-             334:             String  "@type.2d.image"
-             340:             String  "textureHeight"
-             344:             String  "type.sampler"
-             345:             String  "@type.sampler"
-             350:             String  "samplerHeight"
-             354:             String  "type.sampled.image"
-             355:             String  "@type.sampled.image"
-             374:             String  "i"
-             425:             String  "output"
+              65:             String  "Pos"
+              69:             String  "inUV"
+              78:             String  "Normal"
+              82:             String  "UV"
+              86:             String  "VSOutput"
+              97:             String  "TessLevelOuter"
+             101:             String  "TessLevelInner"
+             104:             String  "ConstantsHSOutput"
+             110:             String  "ConstantsHS"
+             114:             String  "patch"
+             127:             String  "HSOutput"
+             134:             String  "@main"
+             141:             String  "InvocationID"
+             146:             String  "midPoint"
+             159:             String  "radius"
+             170:             String  "v0"
+             182:             String  "modelview"
+             187:             String  "lightPos"
+             191:             String  "frustumPlanes"
+             194:             String  "tessellatedEdgeSize"
+             198:             String  "viewportDim"
+             202:             String  "UBO"
+             205:             String  "ubo"
+             214:             String  "int"
+             225:             String  "clip0"
+             243:             String  "clip1"
+             321:             String  "pos"
+             328:             String  "type.2d.image"
+             330:             String  "@type.2d.image"
+             336:             String  "textureHeight"
+             341:             String  "type.sampler"
+             342:             String  "@type.sampler"
+             347:             String  "samplerHeight"
+             351:             String  "type.sampled.image"
+             352:             String  "@type.sampled.image"
+             369:             String  "i"
+             423:             String  "output"
                               Name 6  "main"
                               Name 28  "screenSpaceTessFactor(vf4;vf4;"
                               Name 26  "p0"
@@ -76,103 +76,103 @@ WARNING: 0:158: '' : attribute does not apply to entry point
                               Name 59  "frustumCheck(vf4;vf2;"
                               Name 57  "Pos"
                               Name 58  "inUV"
-                              Name 74  "VSOutput"
-                              MemberName 74(VSOutput) 0  "Pos"
-                              MemberName 74(VSOutput) 1  "Normal"
-                              MemberName 74(VSOutput) 2  "UV"
-                              Name 96  "ConstantsHSOutput"
-                              MemberName 96(ConstantsHSOutput) 0  "TessLevelOuter"
-                              MemberName 96(ConstantsHSOutput) 1  "TessLevelInner"
-                              Name 109  "ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];"
-                              Name 108  "patch"
-                              Name 121  "HSOutput"
-                              MemberName 121(HSOutput) 0  "Pos"
-                              MemberName 121(HSOutput) 1  "Normal"
-                              MemberName 121(HSOutput) 2  "UV"
-                              Name 134  "@main(struct-VSOutput-vf4-vf3-vf21[4];u1;"
-                              Name 132  "patch"
-                              Name 133  "InvocationID"
-                              Name 150  "midPoint"
-                              Name 163  "radius"
-                              Name 174  "v0"
-                              Name 184  "UBO"
-                              MemberName 184(UBO) 0  "projection"
-                              MemberName 184(UBO) 1  "modelview"
-                              MemberName 184(UBO) 2  "lightPos"
-                              MemberName 184(UBO) 3  "frustumPlanes"
-                              MemberName 184(UBO) 4  "displacementFactor"
-                              MemberName 184(UBO) 5  "tessellationFactor"
-                              MemberName 184(UBO) 6  "viewportDim"
-                              MemberName 184(UBO) 7  "tessellatedEdgeSize"
-                              Name 207  "ubo"
-                              MemberName 207(ubo) 0  "ubo"
-                              Name 214  ""
-                              Name 229  "clip0"
-                              Name 247  "clip1"
-                              Name 324  "pos"
-                              Name 338  "textureHeight"
-                              Name 348  "samplerHeight"
-                              Name 372  "i"
-                              Name 423  "output"
-                              Name 433  "param"
+                              Name 73  "VSOutput"
+                              MemberName 73(VSOutput) 0  "Pos"
+                              MemberName 73(VSOutput) 1  "Normal"
+                              MemberName 73(VSOutput) 2  "UV"
+                              Name 95  "ConstantsHSOutput"
+                              MemberName 95(ConstantsHSOutput) 0  "TessLevelOuter"
+                              MemberName 95(ConstantsHSOutput) 1  "TessLevelInner"
+                              Name 108  "ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];"
+                              Name 107  "patch"
+                              Name 119  "HSOutput"
+                              MemberName 119(HSOutput) 0  "Pos"
+                              MemberName 119(HSOutput) 1  "Normal"
+                              MemberName 119(HSOutput) 2  "UV"
+                              Name 132  "@main(struct-VSOutput-vf4-vf3-vf21[4];u1;"
+                              Name 130  "patch"
+                              Name 131  "InvocationID"
+                              Name 144  "midPoint"
+                              Name 157  "radius"
+                              Name 168  "v0"
+                              Name 180  "UBO"
+                              MemberName 180(UBO) 0  "projection"
+                              MemberName 180(UBO) 1  "modelview"
+                              MemberName 180(UBO) 2  "lightPos"
+                              MemberName 180(UBO) 3  "frustumPlanes"
+                              MemberName 180(UBO) 4  "displacementFactor"
+                              MemberName 180(UBO) 5  "tessellationFactor"
+                              MemberName 180(UBO) 6  "viewportDim"
+                              MemberName 180(UBO) 7  "tessellatedEdgeSize"
+                              Name 203  "ubo"
+                              MemberName 203(ubo) 0  "ubo"
+                              Name 210  ""
+                              Name 223  "clip0"
+                              Name 241  "clip1"
+                              Name 319  "pos"
+                              Name 334  "textureHeight"
+                              Name 345  "samplerHeight"
+                              Name 367  "i"
+                              Name 421  "output"
+                              Name 431  "param"
                               Name 436  "param"
-                              Name 474  "param"
+                              Name 471  "param"
                               Name 477  "param"
-                              Name 484  "param"
+                              Name 482  "param"
                               Name 487  "param"
-                              Name 494  "param"
+                              Name 492  "param"
                               Name 497  "param"
-                              Name 504  "param"
+                              Name 502  "param"
                               Name 507  "param"
                               Name 560  "output"
-                              Name 591  "patch"
-                              Name 594  "patch.Pos"
-                              Name 601  "patch.Normal"
-                              Name 608  "patch.UV"
-                              Name 640  "InvocationID"
-                              Name 642  "InvocationID"
-                              Name 644  "flattenTemp"
-                              Name 645  "param"
-                              Name 647  "param"
-                              Name 651  "@entryPointOutput.Pos"
-                              Name 658  "@entryPointOutput.Normal"
-                              Name 665  "@entryPointOutput.UV"
-                              Name 675  "@patchConstantResult"
-                              Name 676  "param"
-                              Name 680  "@patchConstantOutput.TessLevelOuter"
-                              Name 695  "@patchConstantOutput.TessLevelInner"
-                              Decorate 182 ArrayStride 16
-                              MemberDecorate 184(UBO) 0 RowMajor
-                              MemberDecorate 184(UBO) 0 Offset 0
-                              MemberDecorate 184(UBO) 0 MatrixStride 16
-                              MemberDecorate 184(UBO) 1 RowMajor
-                              MemberDecorate 184(UBO) 1 Offset 64
-                              MemberDecorate 184(UBO) 1 MatrixStride 16
-                              MemberDecorate 184(UBO) 2 Offset 128
-                              MemberDecorate 184(UBO) 3 Offset 144
-                              MemberDecorate 184(UBO) 4 Offset 240
-                              MemberDecorate 184(UBO) 5 Offset 244
-                              MemberDecorate 184(UBO) 6 Offset 248
-                              MemberDecorate 184(UBO) 7 Offset 256
-                              MemberDecorate 207(ubo) 0 Offset 0
-                              Decorate 207(ubo) Block
-                              Decorate 214 DescriptorSet 0
-                              Decorate 214 Binding 0
-                              Decorate 338(textureHeight) DescriptorSet 0
-                              Decorate 338(textureHeight) Binding 1
-                              Decorate 348(samplerHeight) DescriptorSet 0
-                              Decorate 348(samplerHeight) Binding 1
-                              Decorate 594(patch.Pos) BuiltIn Position
-                              Decorate 601(patch.Normal) Location 0
-                              Decorate 608(patch.UV) Location 1
-                              Decorate 642(InvocationID) BuiltIn InvocationId
-                              Decorate 651(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 658(@entryPointOutput.Normal) Location 0
-                              Decorate 665(@entryPointOutput.UV) Location 1
-                              Decorate 680(@patchConstantOutput.TessLevelOuter) Patch
-                              Decorate 680(@patchConstantOutput.TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 695(@patchConstantOutput.TessLevelInner) Patch
-                              Decorate 695(@patchConstantOutput.TessLevelInner) BuiltIn TessLevelInner
+                              Name 594  "patch"
+                              Name 597  "patch.Pos"
+                              Name 604  "patch.Normal"
+                              Name 611  "patch.UV"
+                              Name 643  "InvocationID"
+                              Name 645  "InvocationID"
+                              Name 647  "flattenTemp"
+                              Name 648  "param"
+                              Name 650  "param"
+                              Name 654  "@entryPointOutput.Pos"
+                              Name 661  "@entryPointOutput.Normal"
+                              Name 668  "@entryPointOutput.UV"
+                              Name 678  "@patchConstantResult"
+                              Name 679  "param"
+                              Name 683  "@patchConstantOutput.TessLevelOuter"
+                              Name 698  "@patchConstantOutput.TessLevelInner"
+                              Decorate 178 ArrayStride 16
+                              MemberDecorate 180(UBO) 0 RowMajor
+                              MemberDecorate 180(UBO) 0 Offset 0
+                              MemberDecorate 180(UBO) 0 MatrixStride 16
+                              MemberDecorate 180(UBO) 1 RowMajor
+                              MemberDecorate 180(UBO) 1 Offset 64
+                              MemberDecorate 180(UBO) 1 MatrixStride 16
+                              MemberDecorate 180(UBO) 2 Offset 128
+                              MemberDecorate 180(UBO) 3 Offset 144
+                              MemberDecorate 180(UBO) 4 Offset 240
+                              MemberDecorate 180(UBO) 5 Offset 244
+                              MemberDecorate 180(UBO) 6 Offset 248
+                              MemberDecorate 180(UBO) 7 Offset 256
+                              MemberDecorate 203(ubo) 0 Offset 0
+                              Decorate 203(ubo) Block
+                              Decorate 210 DescriptorSet 0
+                              Decorate 210 Binding 0
+                              Decorate 334(textureHeight) DescriptorSet 0
+                              Decorate 334(textureHeight) Binding 1
+                              Decorate 345(samplerHeight) DescriptorSet 0
+                              Decorate 345(samplerHeight) Binding 1
+                              Decorate 597(patch.Pos) BuiltIn Position
+                              Decorate 604(patch.Normal) Location 0
+                              Decorate 611(patch.UV) Location 1
+                              Decorate 645(InvocationID) BuiltIn InvocationId
+                              Decorate 654(@entryPointOutput.Pos) BuiltIn Position
+                              Decorate 661(@entryPointOutput.Normal) Location 0
+                              Decorate 668(@entryPointOutput.UV) Location 1
+                              Decorate 683(@patchConstantOutput.TessLevelOuter) Patch
+                              Decorate 683(@patchConstantOutput.TessLevelOuter) BuiltIn TessLevelOuter
+                              Decorate 698(@patchConstantOutput.TessLevelInner) Patch
+                              Decorate 698(@patchConstantOutput.TessLevelInner) BuiltIn TessLevelInner
                4:             TypeVoid
                5:             TypeFunction 4
                8:             TypeFloat 32
@@ -180,752 +180,744 @@ WARNING: 0:158: '' : attribute does not apply to entry point
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:             TypeVector 8(float) 4
               19:     11(int) Constant 4
-              20:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
+              20:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 19
               21:             TypePointer Function 18(fvec4)
               22:     11(int) Constant 7
-              23:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 16
+              23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 22 16
               24:             TypeFunction 8(float) 21(ptr) 21(ptr)
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 20
-              32:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 33
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 10 20 20
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 33
               34:     11(int) Constant 65
               36:     11(int) Constant 1
               37:     11(int) Constant 5
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 36 19 32 37
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 30 25 32 34 16 35 30 17 34
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 41 20 32 34 16 31 19 36
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 36 19 32 37
+              31:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 30 25 32 34 16 35 30 17 34
+              38:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 39 20 32 34 16 31 19 36
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
               46:     11(int) Constant 2
-              44:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 45 20 32 34 16 31 19 46
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 45 20 32 34 16 31 19 46
               48:             TypeVector 8(float) 2
-              49:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 46
+              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 46
               50:             TypePointer Function 48(fvec2)
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 22 16
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 22 16
               52:             TypeBool
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 53 14 46 16
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 53 14 46 16
               55:             TypeFunction 52(bool) 21(ptr) 50(ptr)
-              56:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 54 20 49
+              56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 54 20 49
               63:     11(int) Constant 95
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 61 56 32 63 16 35 61 17 63
-              66:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 67 20 32 63 16 62 19 36
-              69:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 70 49 32 63 16 62 19 46
-              72:             TypeVector 8(float) 3
-              73:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
-    74(VSOutput):             TypeStruct 18(fvec4) 72(fvec3) 48(fvec2)
-              76:     11(int) Constant 44
-              77:     11(int) Constant 13
-              75:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 67 20 32 76 77 16 16 17
-              80:     11(int) Constant 45
-              81:     11(int) Constant 35
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 79 73 32 80 81 16 16 17
-              84:     11(int) Constant 46
-              85:     11(int) Constant 31
-              82:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 83 49 32 84 85 16 16 17
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 87 36 32 63 16 35 87 16 17 75 78 82
-              88:             TypeArray 74(VSOutput) 19
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 86 19
-              90:             TypePointer Function 88
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 89 22 16
-              92:             TypeArray 8(float) 19
-              93:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 19
-              94:             TypeArray 8(float) 46
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 46
-96(ConstantsHSOutput):             TypeStruct 92 94
-              99:     11(int) Constant 58
-             100:     11(int) Constant 25
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 98 93 32 99 100 16 16 17
-             103:     11(int) Constant 59
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 102 95 32 103 100 16 16 17
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 105 36 32 63 16 35 105 16 17 97 101
-             106:             TypeFunction 96(ConstantsHSOutput) 90(ptr)
-             107:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 104 89
-             113:     11(int) Constant 112
-             112:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 111 107 32 113 16 35 111 17 113
-             116:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 117 89 32 113 16 112 19 36
-             119:             TypePointer Function 11(int)
-             120:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 22 16
-   121(HSOutput):             TypeStruct 18(fvec4) 72(fvec3) 48(fvec2)
-             123:     11(int) Constant 51
-             122:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 67 20 32 123 14 16 16 17
-             125:     11(int) Constant 52
-             124:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 79 73 32 125 81 16 16 17
-             127:     11(int) Constant 53
-             126:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 83 49 32 127 85 16 16 17
-             128:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 129 36 32 113 16 35 129 16 17 122 124 126
-             130:             TypeFunction 121(HSOutput) 90(ptr) 119(ptr)
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 128 89 13
-             138:     11(int) Constant 158
-             137:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 136 131 32 138 16 35 136 17 138
-             141:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 117 89 32 138 16 137 19 36
-             143:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 144 13 32 138 16 137 19 46
-             149:     11(int) Constant 67
-             151:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 152 20 32 149 16 31 19
-             154:    8(float) Constant 1056964608
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 61 56 32 63 16 35 61 17 63
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 65 20 32 63 16 62 19 36
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 69 49 32 63 16 62 19 46
+              71:             TypeVector 8(float) 3
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+    73(VSOutput):             TypeStruct 18(fvec4) 71(fvec3) 48(fvec2)
+              75:     11(int) Constant 44
+              76:     11(int) Constant 13
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 65 20 32 75 76 16 16 17
+              79:     11(int) Constant 45
+              80:     11(int) Constant 35
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 78 72 32 79 80 16 16 17
+              83:     11(int) Constant 46
+              84:     11(int) Constant 31
+              81:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 82 49 32 83 84 16 16 17
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 86 36 32 63 16 35 86 16 17 74 77 81
+              87:             TypeArray 73(VSOutput) 19
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 85 19
+              89:             TypePointer Function 87
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 88 22 16
+              91:             TypeArray 8(float) 19
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 19
+              93:             TypeArray 8(float) 46
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 46
+95(ConstantsHSOutput):             TypeStruct 91 93
+              98:     11(int) Constant 58
+              99:     11(int) Constant 25
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 97 92 32 98 99 16 16 17
+             102:     11(int) Constant 59
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 101 94 32 102 99 16 16 17
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 104 36 32 63 16 35 104 16 17 96 100
+             105:             TypeFunction 95(ConstantsHSOutput) 89(ptr)
+             106:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 103 88
+             112:     11(int) Constant 112
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 110 106 32 112 16 35 110 17 112
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 114 88 32 112 16 111 19 36
+             117:             TypePointer Function 11(int)
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 13 22 16
+   119(HSOutput):             TypeStruct 18(fvec4) 71(fvec3) 48(fvec2)
+             121:     11(int) Constant 51
+             120:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 65 20 32 121 14 16 16 17
+             123:     11(int) Constant 52
+             122:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 78 72 32 123 80 16 16 17
+             125:     11(int) Constant 53
+             124:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 82 49 32 125 84 16 16 17
+             126:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 127 36 32 112 16 35 127 16 17 120 122 124
+             128:             TypeFunction 119(HSOutput) 89(ptr) 117(ptr)
+             129:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 126 88 13
+             136:     11(int) Constant 158
+             135:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 134 129 32 136 16 35 134 17 136
+             137:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 114 88 32 136 16 135 19 36
+             140:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 141 13 32 136 16 135 19 46
+             147:     11(int) Constant 67
+             145:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 146 20 32 147 16 31 19
+             150:    8(float) Constant 1056964608
+             155:             TypePointer Function 8(float)
+             156:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 22 16
              160:     11(int) Constant 69
-             161:             TypePointer Function 8(float)
-             162:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 22 16
-             164:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 165 10 32 160 16 31 19
-             170:    8(float) Constant 1073741824
-             173:     11(int) Constant 72
-             175:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 176 20 32 173 16 31 19
-             179:             TypeMatrix 18(fvec4) 4
-             181:    52(bool) ConstantTrue
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 181
-             182:             TypeArray 18(fvec4) 15
-             183:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 20 15
-        184(UBO):             TypeStruct 179 179 18(fvec4) 182 8(float) 8(float) 48(fvec2) 8(float)
-             187:     11(int) Constant 29
-             188:     11(int) Constant 20
-             185:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 186 180 32 187 188 16 16 17
-             189:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 186 180 32 187 188 16 16 17
-             192:     11(int) Constant 30
-             193:     11(int) Constant 17
-             190:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 191 20 32 192 193 16 16 17
-             196:     11(int) Constant 22
-             194:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 195 183 32 85 196 16 16 17
-             199:     11(int) Constant 27
-             197:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 198 10 32 81 199 16 16 17
-             200:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 198 10 32 81 199 16 16 17
-             203:     11(int) Constant 34
-             201:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 202 49 32 203 188 16 16 17
-             204:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 198 10 32 81 199 16 16 17
-             205:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 206 36 32 173 16 35 206 16 17 185 189 190 194 197 200 201 204
-        207(ubo):             TypeStruct 184(UBO)
-             210:     11(int) Constant 37
-             208:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 209 205 32 210 210 16 16 17
-             211:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 209 36 32 173 16 35 209 16 17 208
-             212:             TypePointer Uniform 207(ubo)
-             213:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 211 46 16
-             214:    212(ptr) Variable Uniform
-             216:     11(int) Constant 8
-             215:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 211 32 173 16 35 1 214 216
-             217:             TypeInt 32 1
-             219:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 218 14 19 16
-             220:    217(int) Constant 0
-             221:    217(int) Constant 1
-             222:             TypePointer Uniform 179
-             223:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 180 46 16
-             228:     11(int) Constant 75
-             230:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 231 20 32 228 16 31 19
-             235:    8(float) Constant 0
-             236:   72(fvec3) ConstantComposite 235 235 235
-             246:     11(int) Constant 76
-             248:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 249 20 32 246 16 31 19
-             262:     11(int) Constant 79
-             269:     11(int) Constant 80
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 159 10 32 160 16 31 19
+             166:    8(float) Constant 1073741824
+             171:     11(int) Constant 72
+             169:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 170 20 32 171 16 31 19
+             175:             TypeMatrix 18(fvec4) 4
+             177:    52(bool) ConstantTrue
+             176:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 20 19 177
+             178:             TypeArray 18(fvec4) 15
+             179:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 20 15
+        180(UBO):             TypeStruct 175 175 18(fvec4) 178 8(float) 8(float) 48(fvec2) 8(float)
+             183:     11(int) Constant 29
+             184:     11(int) Constant 20
+             181:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 182 176 32 183 184 16 16 17
+             185:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 182 176 32 183 184 16 16 17
+             188:     11(int) Constant 30
+             189:     11(int) Constant 17
+             186:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 187 20 32 188 189 16 16 17
+             192:     11(int) Constant 22
+             190:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 191 179 32 84 192 16 16 17
+             195:     11(int) Constant 27
+             193:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 194 10 32 80 195 16 16 17
+             196:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 194 10 32 80 195 16 16 17
+             199:     11(int) Constant 34
+             197:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 198 49 32 199 184 16 16 17
+             200:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 194 10 32 80 195 16 16 17
+             201:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 202 36 32 171 16 35 202 16 17 181 185 186 190 193 196 197 200
+        203(ubo):             TypeStruct 180(UBO)
+             206:     11(int) Constant 37
+             204:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 205 201 32 206 206 16 16 17
+             207:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 205 36 32 171 16 35 205 16 17 204
+             208:             TypePointer Uniform 203(ubo)
+             209:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 207 46 16
+             210:    208(ptr) Variable Uniform
+             212:     11(int) Constant 8
+             211:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 207 32 171 16 35 2 210 212
+             213:             TypeInt 32 1
+             215:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 214 14 19 16
+             216:    213(int) Constant 0
+             217:    213(int) Constant 1
+             218:             TypePointer Uniform 175
+             219:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 176 46 16
+             226:     11(int) Constant 75
+             224:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 225 20 32 226 16 31 19
+             231:    8(float) Constant 0
+             232:   71(fvec3) ConstantComposite 231 231 231
+             244:     11(int) Constant 76
+             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 243 20 32 244 16 31 19
+             259:     11(int) Constant 79
+             266:     11(int) Constant 80
+             271:    213(int) Constant 6
+             272:             TypePointer Uniform 48(fvec2)
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 46 16
              276:     11(int) Constant 83
-             277:    217(int) Constant 6
-             278:             TypePointer Uniform 48(fvec2)
-             279:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 46 16
-             290:     11(int) Constant 84
-             301:     11(int) Constant 89
-             305:    217(int) Constant 7
-             306:             TypePointer Uniform 8(float)
-             307:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 46 16
-             311:    217(int) Constant 5
-             315:    8(float) Constant 1065353216
-             316:    8(float) Constant 1115684864
-             323:     11(int) Constant 98
-             325:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 326 20 32 323 16 62 19
-             330:     11(int) Constant 99
-             331:             TypeImage 8(float) 2D sampled format:Unknown
-             335:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             332:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 333 16 32 330 16 35 334 335 17
-             336:             TypePointer UniformConstant 331
-             337:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 332 16 16
-338(textureHeight):    336(ptr) Variable UniformConstant
-             339:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 340 332 32 330 16 35 340 338(textureHeight) 216
-             342:             TypeSampler
-             343:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 344 36 32 330 16 35 345 335 17
-             346:             TypePointer UniformConstant 342
-             347:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 343 16 16
-348(samplerHeight):    346(ptr) Variable UniformConstant
-             349:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 350 343 32 330 16 35 350 348(samplerHeight) 216
-             352:             TypeSampledImage 331
-             353:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 354 16 32 330 16 35 355 335 17
-             360:    217(int) Constant 4
-             369:     11(int) Constant 102
-             370:             TypePointer Function 217(int)
-             371:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 219 22 16
-             373:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 374 219 32 369 16 62 19
-             389:     11(int) Constant 103
-             391:    217(int) Constant 3
-             393:             TypePointer Uniform 18(fvec4)
-             394:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 46 16
-             398:    8(float) Constant 1090519040
-             403:    52(bool) ConstantFalse
-             406:     11(int) Constant 105
-             414:     11(int) Constant 108
-             420:     11(int) Constant 113
-             421:             TypePointer Function 96(ConstantsHSOutput)
-             422:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 104 22 16
-             424:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 425 104 32 420 16 112 19
-             427:          92 ConstantComposite 235 235 235 235
-             428:          94 ConstantComposite 235 235
-             429:96(ConstantsHSOutput) ConstantComposite 427 428
-             431:     11(int) Constant 115
-             432:    217(int) Constant 2
-             445:     11(int) Constant 117
-             448:     11(int) Constant 118
-             451:     11(int) Constant 119
-             454:     11(int) Constant 120
-             457:     11(int) Constant 121
-             460:     11(int) Constant 122
-             465:     11(int) Constant 126
-             473:     11(int) Constant 128
-             483:     11(int) Constant 129
-             493:     11(int) Constant 130
-             503:     11(int) Constant 131
-             513:     11(int) Constant 132
-             521:     11(int) Constant 133
-             531:     11(int) Constant 139
-             534:     11(int) Constant 140
-             537:     11(int) Constant 141
-             540:     11(int) Constant 142
-             543:     11(int) Constant 143
-             546:     11(int) Constant 144
-             550:     11(int) Constant 148
-             557:     11(int) Constant 159
-             558:             TypePointer Function 121(HSOutput)
-             559:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 128 22 16
-             561:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 425 128 32 557 16 137 19
-             563:   18(fvec4) ConstantComposite 235 235 235 235
-             564:   48(fvec2) ConstantComposite 235 235
-             565:121(HSOutput) ConstantComposite 563 236 564
-             567:     11(int) Constant 160
-             573:     11(int) Constant 161
-             575:             TypePointer Function 72(fvec3)
-             576:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 73 22 16
-             581:     11(int) Constant 162
-             587:     11(int) Constant 163
-             592:             TypeArray 18(fvec4) 19
-             593:             TypePointer Input 592
-  594(patch.Pos):    593(ptr) Variable Input
-             595:             TypePointer Input 18(fvec4)
-             599:             TypeArray 72(fvec3) 19
-             600:             TypePointer Input 599
-601(patch.Normal):    600(ptr) Variable Input
-             602:             TypePointer Input 72(fvec3)
-             606:             TypeArray 48(fvec2) 19
-             607:             TypePointer Input 606
-   608(patch.UV):    607(ptr) Variable Input
-             609:             TypePointer Input 48(fvec2)
-             641:             TypePointer Input 11(int)
-642(InvocationID):    641(ptr) Variable Input
-             650:             TypePointer Output 592
-651(@entryPointOutput.Pos):    650(ptr) Variable Output
-             655:             TypePointer Output 18(fvec4)
-             657:             TypePointer Output 599
-658(@entryPointOutput.Normal):    657(ptr) Variable Output
-             662:             TypePointer Output 72(fvec3)
-             664:             TypePointer Output 606
-665(@entryPointOutput.UV):    664(ptr) Variable Output
-             669:             TypePointer Output 48(fvec2)
-             679:             TypePointer Output 92
-680(@patchConstantOutput.TessLevelOuter):    679(ptr) Variable Output
-             683:             TypePointer Output 8(float)
-             694:             TypePointer Output 94
-695(@patchConstantOutput.TessLevelInner):    694(ptr) Variable Output
-                              Line 1 158 1
+             287:     11(int) Constant 84
+             298:     11(int) Constant 89
+             301:    213(int) Constant 7
+             302:             TypePointer Uniform 8(float)
+             303:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 46 16
+             307:    213(int) Constant 5
+             311:    8(float) Constant 1065353216
+             312:    8(float) Constant 1115684864
+             322:     11(int) Constant 98
+             320:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 321 20 32 322 16 62 19
+             326:             TypeImage 8(float) 2D sampled format:Unknown
+             329:     11(int) Constant 99
+             331:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 328 16 32 329 16 35 330 331 17
+             332:             TypePointer UniformConstant 326
+             333:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 327 16 16
+334(textureHeight):    332(ptr) Variable UniformConstant
+             335:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 336 327 32 329 16 35 336 334(textureHeight) 212
+             339:             TypeSampler
+             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 341 36 32 329 16 35 342 331 17
+             343:             TypePointer UniformConstant 339
+             344:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 340 16 16
+345(samplerHeight):    343(ptr) Variable UniformConstant
+             346:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 347 340 32 329 16 35 347 345(samplerHeight) 212
+             349:             TypeSampledImage 326
+             350:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 351 16 32 329 16 35 352 331 17
+             357:    213(int) Constant 4
+             365:             TypePointer Function 213(int)
+             366:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 215 22 16
+             370:     11(int) Constant 102
+             368:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 369 215 32 370 16 62 19
+             387:     11(int) Constant 103
+             388:    213(int) Constant 3
+             390:             TypePointer Uniform 18(fvec4)
+             391:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 20 46 16
+             395:    8(float) Constant 1090519040
+             400:    52(bool) ConstantFalse
+             403:     11(int) Constant 105
+             413:     11(int) Constant 108
+             419:             TypePointer Function 95(ConstantsHSOutput)
+             420:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 103 22 16
+             424:     11(int) Constant 113
+             422:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 423 103 32 424 16 111 19
+             427:          91 ConstantComposite 231 231 231 231
+             428:          93 ConstantComposite 231 231
+             429:95(ConstantsHSOutput) ConstantComposite 427 428
+             430:    213(int) Constant 2
+             434:     11(int) Constant 115
+             446:     11(int) Constant 117
+             449:     11(int) Constant 118
+             452:     11(int) Constant 119
+             455:     11(int) Constant 120
+             458:     11(int) Constant 121
+             461:     11(int) Constant 122
+             466:     11(int) Constant 126
+             475:     11(int) Constant 128
+             485:     11(int) Constant 129
+             495:     11(int) Constant 130
+             505:     11(int) Constant 131
+             514:     11(int) Constant 132
+             522:     11(int) Constant 133
+             532:     11(int) Constant 139
+             535:     11(int) Constant 140
+             538:     11(int) Constant 141
+             541:     11(int) Constant 142
+             544:     11(int) Constant 143
+             547:     11(int) Constant 144
+             552:     11(int) Constant 148
+             558:             TypePointer Function 119(HSOutput)
+             559:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 126 22 16
+             562:     11(int) Constant 159
+             561:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 423 126 32 562 16 135 19
+             565:   18(fvec4) ConstantComposite 231 231 231 231
+             566:   48(fvec2) ConstantComposite 231 231
+             567:119(HSOutput) ConstantComposite 565 232 566
+             570:     11(int) Constant 160
+             576:     11(int) Constant 161
+             577:             TypePointer Function 71(fvec3)
+             578:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 22 16
+             584:     11(int) Constant 162
+             590:     11(int) Constant 163
+             595:             TypeArray 18(fvec4) 19
+             596:             TypePointer Input 595
+  597(patch.Pos):    596(ptr) Variable Input
+             598:             TypePointer Input 18(fvec4)
+             602:             TypeArray 71(fvec3) 19
+             603:             TypePointer Input 602
+604(patch.Normal):    603(ptr) Variable Input
+             605:             TypePointer Input 71(fvec3)
+             609:             TypeArray 48(fvec2) 19
+             610:             TypePointer Input 609
+   611(patch.UV):    610(ptr) Variable Input
+             612:             TypePointer Input 48(fvec2)
+             644:             TypePointer Input 11(int)
+645(InvocationID):    644(ptr) Variable Input
+             653:             TypePointer Output 595
+654(@entryPointOutput.Pos):    653(ptr) Variable Output
+             658:             TypePointer Output 18(fvec4)
+             660:             TypePointer Output 602
+661(@entryPointOutput.Normal):    660(ptr) Variable Output
+             665:             TypePointer Output 71(fvec3)
+             667:             TypePointer Output 609
+668(@entryPointOutput.UV):    667(ptr) Variable Output
+             672:             TypePointer Output 48(fvec2)
+             682:             TypePointer Output 91
+683(@patchConstantOutput.TessLevelOuter):    682(ptr) Variable Output
+             686:             TypePointer Output 8(float)
+             697:             TypePointer Output 93
+698(@patchConstantOutput.TessLevelInner):    697(ptr) Variable Output
          6(main):           4 Function None 5
                7:             Label
-      591(patch):     90(ptr) Variable Function
-640(InvocationID):    119(ptr) Variable Function
-644(flattenTemp):    558(ptr) Variable Function
-      645(param):     90(ptr) Variable Function
-      647(param):    119(ptr) Variable Function
-675(@patchConstantResult):    421(ptr) Variable Function
-      676(param):     90(ptr) Variable Function
-                              Line 1 158 0
-             596:    595(ptr) AccessChain 594(patch.Pos) 220
-             597:   18(fvec4) Load 596
-             598:     21(ptr) AccessChain 591(patch) 220 220
-                              Store 598 597
-             603:    602(ptr) AccessChain 601(patch.Normal) 220
-             604:   72(fvec3) Load 603
-             605:    575(ptr) AccessChain 591(patch) 220 221
-                              Store 605 604
-             610:    609(ptr) AccessChain 608(patch.UV) 220
-             611:   48(fvec2) Load 610
-             612:     50(ptr) AccessChain 591(patch) 220 432
-                              Store 612 611
-             613:    595(ptr) AccessChain 594(patch.Pos) 221
-             614:   18(fvec4) Load 613
-             615:     21(ptr) AccessChain 591(patch) 221 220
+      594(patch):     89(ptr) Variable Function
+643(InvocationID):    117(ptr) Variable Function
+647(flattenTemp):    558(ptr) Variable Function
+      648(param):     89(ptr) Variable Function
+      650(param):    117(ptr) Variable Function
+678(@patchConstantResult):    419(ptr) Variable Function
+      679(param):     89(ptr) Variable Function
+             599:    598(ptr) AccessChain 597(patch.Pos) 216
+             600:   18(fvec4) Load 599
+             601:     21(ptr) AccessChain 594(patch) 216 216
+                              Store 601 600
+             606:    605(ptr) AccessChain 604(patch.Normal) 216
+             607:   71(fvec3) Load 606
+             608:    577(ptr) AccessChain 594(patch) 216 217
+                              Store 608 607
+             613:    612(ptr) AccessChain 611(patch.UV) 216
+             614:   48(fvec2) Load 613
+             615:     50(ptr) AccessChain 594(patch) 216 430
                               Store 615 614
-             616:    602(ptr) AccessChain 601(patch.Normal) 221
-             617:   72(fvec3) Load 616
-             618:    575(ptr) AccessChain 591(patch) 221 221
+             616:    598(ptr) AccessChain 597(patch.Pos) 217
+             617:   18(fvec4) Load 616
+             618:     21(ptr) AccessChain 594(patch) 217 216
                               Store 618 617
-             619:    609(ptr) AccessChain 608(patch.UV) 221
-             620:   48(fvec2) Load 619
-             621:     50(ptr) AccessChain 591(patch) 221 432
+             619:    605(ptr) AccessChain 604(patch.Normal) 217
+             620:   71(fvec3) Load 619
+             621:    577(ptr) AccessChain 594(patch) 217 217
                               Store 621 620
-             622:    595(ptr) AccessChain 594(patch.Pos) 432
-             623:   18(fvec4) Load 622
-             624:     21(ptr) AccessChain 591(patch) 432 220
+             622:    612(ptr) AccessChain 611(patch.UV) 217
+             623:   48(fvec2) Load 622
+             624:     50(ptr) AccessChain 594(patch) 217 430
                               Store 624 623
-             625:    602(ptr) AccessChain 601(patch.Normal) 432
-             626:   72(fvec3) Load 625
-             627:    575(ptr) AccessChain 591(patch) 432 221
+             625:    598(ptr) AccessChain 597(patch.Pos) 430
+             626:   18(fvec4) Load 625
+             627:     21(ptr) AccessChain 594(patch) 430 216
                               Store 627 626
-             628:    609(ptr) AccessChain 608(patch.UV) 432
-             629:   48(fvec2) Load 628
-             630:     50(ptr) AccessChain 591(patch) 432 432
+             628:    605(ptr) AccessChain 604(patch.Normal) 430
+             629:   71(fvec3) Load 628
+             630:    577(ptr) AccessChain 594(patch) 430 217
                               Store 630 629
-             631:    595(ptr) AccessChain 594(patch.Pos) 391
-             632:   18(fvec4) Load 631
-             633:     21(ptr) AccessChain 591(patch) 391 220
+             631:    612(ptr) AccessChain 611(patch.UV) 430
+             632:   48(fvec2) Load 631
+             633:     50(ptr) AccessChain 594(patch) 430 430
                               Store 633 632
-             634:    602(ptr) AccessChain 601(patch.Normal) 391
-             635:   72(fvec3) Load 634
-             636:    575(ptr) AccessChain 591(patch) 391 221
+             634:    598(ptr) AccessChain 597(patch.Pos) 388
+             635:   18(fvec4) Load 634
+             636:     21(ptr) AccessChain 594(patch) 388 216
                               Store 636 635
-             637:    609(ptr) AccessChain 608(patch.UV) 391
-             638:   48(fvec2) Load 637
-             639:     50(ptr) AccessChain 591(patch) 391 432
+             637:    605(ptr) AccessChain 604(patch.Normal) 388
+             638:   71(fvec3) Load 637
+             639:    577(ptr) AccessChain 594(patch) 388 217
                               Store 639 638
-             643:     11(int) Load 642(InvocationID)
-                              Store 640(InvocationID) 643
-             646:          88 Load 591(patch)
-                              Store 645(param) 646
-             648:     11(int) Load 640(InvocationID)
-                              Store 647(param) 648
-             649:121(HSOutput) FunctionCall 134(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;) 645(param) 647(param)
-                              Store 644(flattenTemp) 649
-             652:     11(int) Load 642(InvocationID)
-             653:     21(ptr) AccessChain 644(flattenTemp) 220
-             654:   18(fvec4) Load 653
-             656:    655(ptr) AccessChain 651(@entryPointOutput.Pos) 652
-                              Store 656 654
-             659:     11(int) Load 642(InvocationID)
-             660:    575(ptr) AccessChain 644(flattenTemp) 221
-             661:   72(fvec3) Load 660
-             663:    662(ptr) AccessChain 658(@entryPointOutput.Normal) 659
-                              Store 663 661
-             666:     11(int) Load 642(InvocationID)
-             667:     50(ptr) AccessChain 644(flattenTemp) 432
-             668:   48(fvec2) Load 667
-             670:    669(ptr) AccessChain 665(@entryPointOutput.UV) 666
-                              Store 670 668
+             640:    612(ptr) AccessChain 611(patch.UV) 388
+             641:   48(fvec2) Load 640
+             642:     50(ptr) AccessChain 594(patch) 388 430
+                              Store 642 641
+             646:     11(int) Load 645(InvocationID)
+                              Store 643(InvocationID) 646
+             649:          87 Load 594(patch)
+                              Store 648(param) 649
+             651:     11(int) Load 643(InvocationID)
+                              Store 650(param) 651
+             652:119(HSOutput) FunctionCall 132(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;) 648(param) 650(param)
+                              Store 647(flattenTemp) 652
+             655:     11(int) Load 645(InvocationID)
+             656:     21(ptr) AccessChain 647(flattenTemp) 216
+             657:   18(fvec4) Load 656
+             659:    658(ptr) AccessChain 654(@entryPointOutput.Pos) 655
+                              Store 659 657
+             662:     11(int) Load 645(InvocationID)
+             663:    577(ptr) AccessChain 647(flattenTemp) 217
+             664:   71(fvec3) Load 663
+             666:    665(ptr) AccessChain 661(@entryPointOutput.Normal) 662
+                              Store 666 664
+             669:     11(int) Load 645(InvocationID)
+             670:     50(ptr) AccessChain 647(flattenTemp) 430
+             671:   48(fvec2) Load 670
+             673:    672(ptr) AccessChain 668(@entryPointOutput.UV) 669
+                              Store 673 671
                               ControlBarrier 46 19 16
-             671:     11(int) Load 642(InvocationID)
-             672:    52(bool) IEqual 671 220
-                              SelectionMerge 674 None
-                              BranchConditional 672 673 674
-             673:               Label
-             677:          88   Load 591(patch)
-                                Store 676(param) 677
-             678:96(ConstantsHSOutput)   FunctionCall 109(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];) 676(param)
-                                Store 675(@patchConstantResult) 678
-             681:    161(ptr)   AccessChain 675(@patchConstantResult) 220 220
-             682:    8(float)   Load 681
-             684:    683(ptr)   AccessChain 680(@patchConstantOutput.TessLevelOuter) 220
-                                Store 684 682
-             685:    161(ptr)   AccessChain 675(@patchConstantResult) 220 221
-             686:    8(float)   Load 685
-             687:    683(ptr)   AccessChain 680(@patchConstantOutput.TessLevelOuter) 221
-                                Store 687 686
-             688:    161(ptr)   AccessChain 675(@patchConstantResult) 220 432
+             674:     11(int) Load 645(InvocationID)
+             675:    52(bool) IEqual 674 216
+                              SelectionMerge 677 None
+                              BranchConditional 675 676 677
+             676:               Label
+             680:          87   Load 594(patch)
+                                Store 679(param) 680
+             681:95(ConstantsHSOutput)   FunctionCall 108(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];) 679(param)
+                                Store 678(@patchConstantResult) 681
+             684:    155(ptr)   AccessChain 678(@patchConstantResult) 216 216
+             685:    8(float)   Load 684
+             687:    686(ptr)   AccessChain 683(@patchConstantOutput.TessLevelOuter) 216
+                                Store 687 685
+             688:    155(ptr)   AccessChain 678(@patchConstantResult) 216 217
              689:    8(float)   Load 688
-             690:    683(ptr)   AccessChain 680(@patchConstantOutput.TessLevelOuter) 432
+             690:    686(ptr)   AccessChain 683(@patchConstantOutput.TessLevelOuter) 217
                                 Store 690 689
-             691:    161(ptr)   AccessChain 675(@patchConstantResult) 220 391
+             691:    155(ptr)   AccessChain 678(@patchConstantResult) 216 430
              692:    8(float)   Load 691
-             693:    683(ptr)   AccessChain 680(@patchConstantOutput.TessLevelOuter) 391
+             693:    686(ptr)   AccessChain 683(@patchConstantOutput.TessLevelOuter) 430
                                 Store 693 692
-             696:    161(ptr)   AccessChain 675(@patchConstantResult) 221 220
-             697:    8(float)   Load 696
-             698:    683(ptr)   AccessChain 695(@patchConstantOutput.TessLevelInner) 220
-                                Store 698 697
-             699:    161(ptr)   AccessChain 675(@patchConstantResult) 221 221
+             694:    155(ptr)   AccessChain 678(@patchConstantResult) 216 388
+             695:    8(float)   Load 694
+             696:    686(ptr)   AccessChain 683(@patchConstantOutput.TessLevelOuter) 388
+                                Store 696 695
+             699:    155(ptr)   AccessChain 678(@patchConstantResult) 217 216
              700:    8(float)   Load 699
-             701:    683(ptr)   AccessChain 695(@patchConstantOutput.TessLevelInner) 221
+             701:    686(ptr)   AccessChain 698(@patchConstantOutput.TessLevelInner) 216
                                 Store 701 700
-                                Branch 674
-             674:             Label
+             702:    155(ptr)   AccessChain 678(@patchConstantResult) 217 217
+             703:    8(float)   Load 702
+             704:    686(ptr)   AccessChain 698(@patchConstantOutput.TessLevelInner) 217
+                                Store 704 703
+                                Branch 677
+             677:             Label
                               Return
                               FunctionEnd
-                              Line 1 65 1
 28(screenSpaceTessFactor(vf4;vf4;):    8(float) Function None 24
           26(p0):     21(ptr) FunctionParameter
           27(p1):     21(ptr) FunctionParameter
               29:             Label
-   150(midPoint):     21(ptr) Variable Function
-     163(radius):    161(ptr) Variable Function
-         174(v0):     21(ptr) Variable Function
-      229(clip0):     21(ptr) Variable Function
-      247(clip1):     21(ptr) Variable Function
-              38:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 31
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 34 34 16 16
-              42:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 40 26(p0) 43
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 44 27(p1) 43
-             146:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 31 28(screenSpaceTessFactor(vf4;vf4;)
-             147:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 31
-             148:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 149 149 16 16
-             153:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 151 150(midPoint) 43
-             155:   18(fvec4) Load 26(p0)
-             156:   18(fvec4) Load 27(p1)
-             157:   18(fvec4) FAdd 155 156
-             158:   18(fvec4) VectorTimesScalar 157 154
-                              Store 150(midPoint) 158
-             159:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 160 160 16 16
-             166:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 164 163(radius) 43
-             167:   18(fvec4) Load 26(p0)
-             168:   18(fvec4) Load 27(p1)
-             169:    8(float) ExtInst 3(GLSL.std.450) 67(Distance) 167 168
-             171:    8(float) FDiv 169 170
-                              Store 163(radius) 171
-             172:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 173 173 16 16
-             177:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 175 174(v0) 43
-             178:   18(fvec4) Load 150(midPoint)
-             224:    222(ptr) AccessChain 214 220 221
-             225:         179 Load 224
-             226:   18(fvec4) VectorTimesMatrix 178 225
-                              Store 174(v0) 226
-             227:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 228 228 16 16
-             232:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 230 229(clip0) 43
-             233:   18(fvec4) Load 174(v0)
-             234:    8(float) Load 163(radius)
-             237:    8(float) CompositeExtract 236 0
-             238:    8(float) CompositeExtract 236 1
-             239:    8(float) CompositeExtract 236 2
-             240:   18(fvec4) CompositeConstruct 234 237 238 239
-             241:   18(fvec4) FSub 233 240
-             242:    222(ptr) AccessChain 214 220 220
-             243:         179 Load 242
-             244:   18(fvec4) VectorTimesMatrix 241 243
-                              Store 229(clip0) 244
-             245:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 246 246 16 16
-             250:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 248 247(clip1) 43
-             251:   18(fvec4) Load 174(v0)
-             252:    8(float) Load 163(radius)
-             253:    8(float) CompositeExtract 236 0
-             254:    8(float) CompositeExtract 236 1
-             255:    8(float) CompositeExtract 236 2
-             256:   18(fvec4) CompositeConstruct 252 253 254 255
-             257:   18(fvec4) FAdd 251 256
-             258:    222(ptr) AccessChain 214 220 220
-             259:         179 Load 258
-             260:   18(fvec4) VectorTimesMatrix 257 259
-                              Store 247(clip1) 260
-             261:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 262 262 16 16
-             263:    161(ptr) AccessChain 229(clip0) 17
-             264:    8(float) Load 263
-             265:   18(fvec4) Load 229(clip0)
-             266:   18(fvec4) CompositeConstruct 264 264 264 264
-             267:   18(fvec4) FDiv 265 266
-                              Store 229(clip0) 267
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 269 269 16 16
-             270:    161(ptr) AccessChain 247(clip1) 17
-             271:    8(float) Load 270
-             272:   18(fvec4) Load 247(clip1)
-             273:   18(fvec4) CompositeConstruct 271 271 271 271
-             274:   18(fvec4) FDiv 272 273
-                              Store 247(clip1) 274
-             275:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 276 276 16 16
-             280:    278(ptr) AccessChain 214 220 277
-             281:   48(fvec2) Load 280
-             282:   18(fvec4) Load 229(clip0)
-             283:   48(fvec2) VectorShuffle 282 282 0 1
-             284:   48(fvec2) FMul 283 281
-             285:    161(ptr) AccessChain 229(clip0) 16
-             286:    8(float) CompositeExtract 284 0
-                              Store 285 286
-             287:    161(ptr) AccessChain 229(clip0) 36
-             288:    8(float) CompositeExtract 284 1
-                              Store 287 288
-             289:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 290 290 16 16
-             291:    278(ptr) AccessChain 214 220 277
-             292:   48(fvec2) Load 291
-             293:   18(fvec4) Load 247(clip1)
-             294:   48(fvec2) VectorShuffle 293 293 0 1
-             295:   48(fvec2) FMul 294 292
-             296:    161(ptr) AccessChain 247(clip1) 16
-             297:    8(float) CompositeExtract 295 0
-                              Store 296 297
-             298:    161(ptr) AccessChain 247(clip1) 36
-             299:    8(float) CompositeExtract 295 1
-                              Store 298 299
-             300:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 301 301 16 16
-             302:   18(fvec4) Load 229(clip0)
-             303:   18(fvec4) Load 247(clip1)
-             304:    8(float) ExtInst 3(GLSL.std.450) 67(Distance) 302 303
-             308:    306(ptr) AccessChain 214 220 305
+   144(midPoint):     21(ptr) Variable Function
+     157(radius):    155(ptr) Variable Function
+         168(v0):     21(ptr) Variable Function
+      223(clip0):     21(ptr) Variable Function
+      241(clip1):     21(ptr) Variable Function
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 31
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 34 34 16 16
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 38 26(p0) 41
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 44 27(p1) 41
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 31 28(screenSpaceTessFactor(vf4;vf4;)
+             149:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 147 147 16 16
+             148:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 145 144(midPoint) 41
+             151:   18(fvec4) Load 26(p0)
+             152:   18(fvec4) Load 27(p1)
+             153:   18(fvec4) FAdd 151 152
+             154:   18(fvec4) VectorTimesScalar 153 150
+                              Store 144(midPoint) 154
+             162:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 160 160 16 16
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 158 157(radius) 41
+             163:   18(fvec4) Load 26(p0)
+             164:   18(fvec4) Load 27(p1)
+             165:    8(float) ExtInst 3(GLSL.std.450) 67(Distance) 163 164
+             167:    8(float) FDiv 165 166
+                              Store 157(radius) 167
+             173:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 171 171 16 16
+             172:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 169 168(v0) 41
+             174:   18(fvec4) Load 144(midPoint)
+             220:    218(ptr) AccessChain 210 216 217
+             221:         175 Load 220
+             222:   18(fvec4) VectorTimesMatrix 174 221
+                              Store 168(v0) 222
+             228:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 226 226 16 16
+             227:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 224 223(clip0) 41
+             229:   18(fvec4) Load 168(v0)
+             230:    8(float) Load 157(radius)
+             233:    8(float) CompositeExtract 232 0
+             234:    8(float) CompositeExtract 232 1
+             235:    8(float) CompositeExtract 232 2
+             236:   18(fvec4) CompositeConstruct 230 233 234 235
+             237:   18(fvec4) FSub 229 236
+             238:    218(ptr) AccessChain 210 216 216
+             239:         175 Load 238
+             240:   18(fvec4) VectorTimesMatrix 237 239
+                              Store 223(clip0) 240
+             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 244 244 16 16
+             245:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 242 241(clip1) 41
+             247:   18(fvec4) Load 168(v0)
+             248:    8(float) Load 157(radius)
+             249:    8(float) CompositeExtract 232 0
+             250:    8(float) CompositeExtract 232 1
+             251:    8(float) CompositeExtract 232 2
+             252:   18(fvec4) CompositeConstruct 248 249 250 251
+             253:   18(fvec4) FAdd 247 252
+             254:    218(ptr) AccessChain 210 216 216
+             255:         175 Load 254
+             256:   18(fvec4) VectorTimesMatrix 253 255
+                              Store 241(clip1) 256
+             258:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 259 259 16 16
+             257:    155(ptr) AccessChain 223(clip0) 17
+             260:    8(float) Load 257
+             261:   18(fvec4) Load 223(clip0)
+             262:   18(fvec4) CompositeConstruct 260 260 260 260
+             263:   18(fvec4) FDiv 261 262
+                              Store 223(clip0) 263
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 266 266 16 16
+             264:    155(ptr) AccessChain 241(clip1) 17
+             267:    8(float) Load 264
+             268:   18(fvec4) Load 241(clip1)
+             269:   18(fvec4) CompositeConstruct 267 267 267 267
+             270:   18(fvec4) FDiv 268 269
+                              Store 241(clip1) 270
+             275:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 276 276 16 16
+             274:    272(ptr) AccessChain 210 216 271
+             277:   48(fvec2) Load 274
+             278:   18(fvec4) Load 223(clip0)
+             279:   48(fvec2) VectorShuffle 278 278 0 1
+             280:   48(fvec2) FMul 279 277
+             281:    155(ptr) AccessChain 223(clip0) 16
+             282:    8(float) CompositeExtract 280 0
+                              Store 281 282
+             283:    155(ptr) AccessChain 223(clip0) 36
+             284:    8(float) CompositeExtract 280 1
+                              Store 283 284
+             286:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 287 287 16 16
+             285:    272(ptr) AccessChain 210 216 271
+             288:   48(fvec2) Load 285
+             289:   18(fvec4) Load 241(clip1)
+             290:   48(fvec2) VectorShuffle 289 289 0 1
+             291:   48(fvec2) FMul 290 288
+             292:    155(ptr) AccessChain 241(clip1) 16
+             293:    8(float) CompositeExtract 291 0
+                              Store 292 293
+             294:    155(ptr) AccessChain 241(clip1) 36
+             295:    8(float) CompositeExtract 291 1
+                              Store 294 295
+             297:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 298 298 16 16
+             296:   18(fvec4) Load 223(clip0)
+             299:   18(fvec4) Load 241(clip1)
+             300:    8(float) ExtInst 3(GLSL.std.450) 67(Distance) 296 299
+             304:    302(ptr) AccessChain 210 216 301
+             305:    8(float) Load 304
+             306:    8(float) FDiv 300 305
+             308:    302(ptr) AccessChain 210 216 307
              309:    8(float) Load 308
-             310:    8(float) FDiv 304 309
-             312:    306(ptr) AccessChain 214 220 311
-             313:    8(float) Load 312
-             314:    8(float) FMul 310 313
-             317:    8(float) ExtInst 3(GLSL.std.450) 43(FClamp) 314 315 316
-                              ReturnValue 317
+             310:    8(float) FMul 306 309
+             313:    8(float) ExtInst 3(GLSL.std.450) 43(FClamp) 310 311 312
+                              ReturnValue 313
                               FunctionEnd
-                              Line 1 95 1
 59(frustumCheck(vf4;vf2;):    52(bool) Function None 55
          57(Pos):     21(ptr) FunctionParameter
         58(inUV):     50(ptr) FunctionParameter
               60:             Label
-        324(pos):     21(ptr) Variable Function
-          372(i):    370(ptr) Variable Function
-              64:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 63 63 16 16
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 66 57(Pos) 43
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 69 58(inUV) 43
-             320:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 62 59(frustumCheck(vf4;vf2;)
-             321:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             322:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 323 323 16 16
-             327:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 325 324(pos) 43
-             328:   18(fvec4) Load 57(Pos)
-                              Store 324(pos) 328
-             329:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 330 330 16 16
-             341:         331 Load 338(textureHeight)
-             351:         342 Load 348(samplerHeight)
-             356:         352 SampledImage 341 351
-             357:   48(fvec2) Load 58(inUV)
-             358:   18(fvec4) ImageSampleExplicitLod 356 357 Lod 235
-             359:    8(float) CompositeExtract 358 0
-             361:    306(ptr) AccessChain 214 220 360
+        319(pos):     21(ptr) Variable Function
+          367(i):    365(ptr) Variable Function
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+              66:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 64 57(Pos) 41
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 68 58(inUV) 41
+             318:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 63 63 16 16
+             317:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 62 59(frustumCheck(vf4;vf2;)
+             324:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 322 322 16 16
+             323:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 320 319(pos) 41
+             325:   18(fvec4) Load 57(Pos)
+                              Store 319(pos) 325
+             338:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 329 329 16 16
+             337:         326 Load 334(textureHeight)
+             348:         339 Load 345(samplerHeight)
+             353:         349 SampledImage 337 348
+             354:   48(fvec2) Load 58(inUV)
+             355:   18(fvec4) ImageSampleExplicitLod 353 354 Lod 231
+             356:    8(float) CompositeExtract 355 0
+             358:    302(ptr) AccessChain 210 216 357
+             359:    8(float) Load 358
+             360:    8(float) FMul 356 359
+             361:    155(ptr) AccessChain 319(pos) 36
              362:    8(float) Load 361
-             363:    8(float) FMul 359 362
-             364:    161(ptr) AccessChain 324(pos) 36
-             365:    8(float) Load 364
-             366:    8(float) FSub 365 363
-             367:    161(ptr) AccessChain 324(pos) 36
-                              Store 367 366
-             368:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 369 369 16 16
-             375:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 373 372(i) 43
-                              Store 372(i) 220
-                              Branch 376
-             376:             Label
-             380:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             381:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 369 369 16 16
-                              LoopMerge 378 379 None
-                              Branch 382
-             382:             Label
-             383:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             384:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 369 369 16 16
-             385:    217(int) Load 372(i)
-             386:    52(bool) SLessThan 385 277
-                              BranchConditional 386 377 378
-             377:               Label
-             387:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             388:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 389 389 16 16
-             390:   18(fvec4)   Load 324(pos)
-             392:    217(int)   Load 372(i)
-             395:    393(ptr)   AccessChain 214 220 391 392
-             396:   18(fvec4)   Load 395
-             397:    8(float)   Dot 390 396
-             399:    8(float)   FAdd 397 398
-             400:    52(bool)   FOrdLessThan 399 235
-                                SelectionMerge 402 None
-                                BranchConditional 400 401 402
-             401:                 Label
-             404:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             405:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 406 406 16 16
-                                  ReturnValue 403
-             402:               Label
-                                Branch 379
-             379:               Label
-             408:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             409:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 369 369 16 16
-             410:    217(int)   Load 372(i)
-             411:    217(int)   IAdd 410 221
-                                Store 372(i) 411
+             363:    8(float) FSub 362 360
+             364:    155(ptr) AccessChain 319(pos) 36
+                              Store 364 363
+             372:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 370 370 16 16
+             371:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 368 367(i) 41
+                              Store 367(i) 216
+                              Branch 373
+             373:             Label
+             377:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             378:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 370 370 16 16
+                              LoopMerge 375 376 None
+                              Branch 379
+             379:             Label
+             381:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             382:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 370 370 16 16
+             380:    213(int) Load 367(i)
+             383:    52(bool) SLessThan 380 271
+                              BranchConditional 383 374 375
+             374:               Label
+             385:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             386:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 387 387 16 16
+             384:   18(fvec4)   Load 319(pos)
+             389:    213(int)   Load 367(i)
+             392:    390(ptr)   AccessChain 210 216 388 389
+             393:   18(fvec4)   Load 392
+             394:    8(float)   Dot 384 393
+             396:    8(float)   FAdd 394 395
+             397:    52(bool)   FOrdLessThan 396 231
+                                SelectionMerge 399 None
+                                BranchConditional 397 398 399
+             398:                 Label
+             401:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             402:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 403 403 16 16
+                                  ReturnValue 400
+             399:               Label
+             406:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
                                 Branch 376
-             378:             Label
-             412:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
-             413:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 414 414 16 16
-                              ReturnValue 181
+             376:               Label
+             408:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             409:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 370 370 16 16
+             407:    213(int)   Load 367(i)
+             410:    213(int)   IAdd 407 217
+                                Store 367(i) 410
+                                Branch 373
+             375:             Label
+             411:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 62
+             412:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 413 413 16 16
+                              ReturnValue 177
                               FunctionEnd
-                              Line 1 112 1
-109(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];):96(ConstantsHSOutput) Function None 106
-      108(patch):     90(ptr) FunctionParameter
-             110:             Label
-     423(output):    421(ptr) Variable Function
-      433(param):     21(ptr) Variable Function
+108(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];):95(ConstantsHSOutput) Function None 105
+      107(patch):     89(ptr) FunctionParameter
+             109:             Label
+     421(output):    419(ptr) Variable Function
+      431(param):     21(ptr) Variable Function
       436(param):     50(ptr) Variable Function
-      474(param):     21(ptr) Variable Function
+      471(param):     21(ptr) Variable Function
       477(param):     21(ptr) Variable Function
-      484(param):     21(ptr) Variable Function
+      482(param):     21(ptr) Variable Function
       487(param):     21(ptr) Variable Function
-      494(param):     21(ptr) Variable Function
+      492(param):     21(ptr) Variable Function
       497(param):     21(ptr) Variable Function
-      504(param):     21(ptr) Variable Function
+      502(param):     21(ptr) Variable Function
       507(param):     21(ptr) Variable Function
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             115:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 113 113 16 16
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 116 108(patch) 43
-             417:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 112 109(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];)
-             418:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             419:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 420 420 16 16
-             426:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 424 423(output) 43
-                              Store 423(output) 429
-             430:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 431 431 16 16
-             434:     21(ptr) AccessChain 108(patch) 220 220
-             435:   18(fvec4) Load 434
-                              Store 433(param) 435
-             437:     50(ptr) AccessChain 108(patch) 220 432
+             116:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             115:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 113 107(patch) 41
+             418:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 112 112 16 16
+             417:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 111 108(ConstantsHS(struct-VSOutput-vf4-vf3-vf21[4];)
+             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 424 424 16 16
+             425:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 422 421(output) 41
+                              Store 421(output) 429
+             433:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 434 434 16 16
+             432:     21(ptr) AccessChain 107(patch) 216 216
+             435:   18(fvec4) Load 432
+                              Store 431(param) 435
+             437:     50(ptr) AccessChain 107(patch) 216 430
              438:   48(fvec2) Load 437
                               Store 436(param) 438
-             439:    52(bool) FunctionCall 59(frustumCheck(vf4;vf2;) 433(param) 436(param)
+             439:    52(bool) FunctionCall 59(frustumCheck(vf4;vf2;) 431(param) 436(param)
              440:    52(bool) LogicalNot 439
                               SelectionMerge 442 None
                               BranchConditional 440 441 462
              441:               Label
-             443:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             444:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 445 445 16 16
-             446:    161(ptr)   AccessChain 423(output) 221 220
-                                Store 446 235
-             447:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 448 448 16 16
-             449:    161(ptr)   AccessChain 423(output) 221 221
-                                Store 449 235
-             450:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 451 451 16 16
-             452:    161(ptr)   AccessChain 423(output) 220 220
-                                Store 452 235
-             453:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 454 454 16 16
-             455:    161(ptr)   AccessChain 423(output) 220 221
-                                Store 455 235
-             456:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 457 457 16 16
-             458:    161(ptr)   AccessChain 423(output) 220 432
-                                Store 458 235
-             459:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 460 460 16 16
-             461:    161(ptr)   AccessChain 423(output) 220 391
-                                Store 461 235
+             444:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             445:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 446 446 16 16
+             443:    155(ptr)   AccessChain 421(output) 217 216
+                                Store 443 231
+             448:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 449 449 16 16
+             447:    155(ptr)   AccessChain 421(output) 217 217
+                                Store 447 231
+             451:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 452 452 16 16
+             450:    155(ptr)   AccessChain 421(output) 216 216
+                                Store 450 231
+             454:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 455 455 16 16
+             453:    155(ptr)   AccessChain 421(output) 216 217
+                                Store 453 231
+             457:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 458 458 16 16
+             456:    155(ptr)   AccessChain 421(output) 216 430
+                                Store 456 231
+             460:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 461 461 16 16
+             459:    155(ptr)   AccessChain 421(output) 216 388
+                                Store 459 231
                                 Branch 442
              462:               Label
-             463:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             464:           4   ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 465 465 16 16
-             466:    306(ptr)   AccessChain 214 220 311
-             467:    8(float)   Load 466
-             468:    52(bool)   FOrdGreaterThan 467 235
+             464:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             465:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 466 466 16 16
+             463:    302(ptr)   AccessChain 210 216 307
+             467:    8(float)   Load 463
+             468:    52(bool)   FOrdGreaterThan 467 231
                                 SelectionMerge 470 None
                                 BranchConditional 468 469 528
              469:                 Label
-             471:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             472:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 473 473 16 16
-             475:     21(ptr)     AccessChain 108(patch) 391 220
-             476:   18(fvec4)     Load 475
-                                  Store 474(param) 476
-             478:     21(ptr)     AccessChain 108(patch) 220 220
+             473:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             474:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 475 475 16 16
+             472:     21(ptr)     AccessChain 107(patch) 388 216
+             476:   18(fvec4)     Load 472
+                                  Store 471(param) 476
+             478:     21(ptr)     AccessChain 107(patch) 216 216
              479:   18(fvec4)     Load 478
                                   Store 477(param) 479
-             480:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 474(param) 477(param)
-             481:    161(ptr)     AccessChain 423(output) 220 220
+             480:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 471(param) 477(param)
+             481:    155(ptr)     AccessChain 421(output) 216 216
                                   Store 481 480
-             482:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 483 483 16 16
-             485:     21(ptr)     AccessChain 108(patch) 220 220
-             486:   18(fvec4)     Load 485
-                                  Store 484(param) 486
-             488:     21(ptr)     AccessChain 108(patch) 221 220
+             484:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 485 485 16 16
+             483:     21(ptr)     AccessChain 107(patch) 216 216
+             486:   18(fvec4)     Load 483
+                                  Store 482(param) 486
+             488:     21(ptr)     AccessChain 107(patch) 217 216
              489:   18(fvec4)     Load 488
                                   Store 487(param) 489
-             490:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 484(param) 487(param)
-             491:    161(ptr)     AccessChain 423(output) 220 221
+             490:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 482(param) 487(param)
+             491:    155(ptr)     AccessChain 421(output) 216 217
                                   Store 491 490
-             492:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 493 493 16 16
-             495:     21(ptr)     AccessChain 108(patch) 221 220
-             496:   18(fvec4)     Load 495
-                                  Store 494(param) 496
-             498:     21(ptr)     AccessChain 108(patch) 432 220
+             494:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 495 495 16 16
+             493:     21(ptr)     AccessChain 107(patch) 217 216
+             496:   18(fvec4)     Load 493
+                                  Store 492(param) 496
+             498:     21(ptr)     AccessChain 107(patch) 430 216
              499:   18(fvec4)     Load 498
                                   Store 497(param) 499
-             500:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 494(param) 497(param)
-             501:    161(ptr)     AccessChain 423(output) 220 432
+             500:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 492(param) 497(param)
+             501:    155(ptr)     AccessChain 421(output) 216 430
                                   Store 501 500
-             502:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 503 503 16 16
-             505:     21(ptr)     AccessChain 108(patch) 432 220
-             506:   18(fvec4)     Load 505
-                                  Store 504(param) 506
-             508:     21(ptr)     AccessChain 108(patch) 391 220
+             504:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 505 505 16 16
+             503:     21(ptr)     AccessChain 107(patch) 430 216
+             506:   18(fvec4)     Load 503
+                                  Store 502(param) 506
+             508:     21(ptr)     AccessChain 107(patch) 388 216
              509:   18(fvec4)     Load 508
                                   Store 507(param) 509
-             510:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 504(param) 507(param)
-             511:    161(ptr)     AccessChain 423(output) 220 391
+             510:    8(float)     FunctionCall 28(screenSpaceTessFactor(vf4;vf4;) 502(param) 507(param)
+             511:    155(ptr)     AccessChain 421(output) 216 388
                                   Store 511 510
-             512:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 513 513 16 16
-             514:    161(ptr)     AccessChain 423(output) 220 220
-             515:    8(float)     Load 514
-             516:    161(ptr)     AccessChain 423(output) 220 391
+             513:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 514 514 16 16
+             512:    155(ptr)     AccessChain 421(output) 216 216
+             515:    8(float)     Load 512
+             516:    155(ptr)     AccessChain 421(output) 216 388
              517:    8(float)     Load 516
-             518:    8(float)     ExtInst 3(GLSL.std.450) 46(FMix) 515 517 154
-             519:    161(ptr)     AccessChain 423(output) 221 220
+             518:    8(float)     ExtInst 3(GLSL.std.450) 46(FMix) 515 517 150
+             519:    155(ptr)     AccessChain 421(output) 217 216
                                   Store 519 518
-             520:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 521 521 16 16
-             522:    161(ptr)     AccessChain 423(output) 220 432
-             523:    8(float)     Load 522
-             524:    161(ptr)     AccessChain 423(output) 220 221
+             521:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 522 522 16 16
+             520:    155(ptr)     AccessChain 421(output) 216 430
+             523:    8(float)     Load 520
+             524:    155(ptr)     AccessChain 421(output) 216 217
              525:    8(float)     Load 524
-             526:    8(float)     ExtInst 3(GLSL.std.450) 46(FMix) 523 525 154
-             527:    161(ptr)     AccessChain 423(output) 221 221
+             526:    8(float)     ExtInst 3(GLSL.std.450) 46(FMix) 523 525 150
+             527:    155(ptr)     AccessChain 421(output) 217 217
                                   Store 527 526
                                   Branch 470
              528:                 Label
-             529:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             530:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 531 531 16 16
-             532:    161(ptr)     AccessChain 423(output) 221 220
-                                  Store 532 315
-             533:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 534 534 16 16
-             535:    161(ptr)     AccessChain 423(output) 221 221
-                                  Store 535 315
-             536:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 537 537 16 16
-             538:    161(ptr)     AccessChain 423(output) 220 220
-                                  Store 538 315
-             539:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 540 540 16 16
-             541:    161(ptr)     AccessChain 423(output) 220 221
-                                  Store 541 315
-             542:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 543 543 16 16
-             544:    161(ptr)     AccessChain 423(output) 220 432
-                                  Store 544 315
-             545:           4     ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 546 546 16 16
-             547:    161(ptr)     AccessChain 423(output) 220 391
-                                  Store 547 315
+             530:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             531:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 532 532 16 16
+             529:    155(ptr)     AccessChain 421(output) 217 216
+                                  Store 529 311
+             534:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 535 535 16 16
+             533:    155(ptr)     AccessChain 421(output) 217 217
+                                  Store 533 311
+             537:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 538 538 16 16
+             536:    155(ptr)     AccessChain 421(output) 216 216
+                                  Store 536 311
+             540:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 541 541 16 16
+             539:    155(ptr)     AccessChain 421(output) 216 217
+                                  Store 539 311
+             543:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 544 544 16 16
+             542:    155(ptr)     AccessChain 421(output) 216 430
+                                  Store 542 311
+             546:           4     ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 547 547 16 16
+             545:    155(ptr)     AccessChain 421(output) 216 388
+                                  Store 545 311
                                   Branch 470
              470:               Label
+             548:           4   ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
                                 Branch 442
              442:             Label
-             548:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 112
-             549:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 550 550 16 16
-             551:96(ConstantsHSOutput) Load 423(output)
-                              ReturnValue 551
+             550:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 111
+             551:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 552 552 16 16
+             549:95(ConstantsHSOutput) Load 421(output)
+                              ReturnValue 549
                               FunctionEnd
-                              Line 1 158 1
-134(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;):121(HSOutput) Function None 130
-      132(patch):     90(ptr) FunctionParameter
-133(InvocationID):    119(ptr) FunctionParameter
-             135:             Label
+132(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;):119(HSOutput) Function None 128
+      130(patch):     89(ptr) FunctionParameter
+131(InvocationID):    117(ptr) FunctionParameter
+             133:             Label
      560(output):    558(ptr) Variable Function
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 137
-             140:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 138 138 16 16
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 141 132(patch) 43
-             145:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 143 133(InvocationID) 43
-             554:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 137 134(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;)
-             555:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 137
-             556:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 557 557 16 16
-             562:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 561 560(output) 43
-                              Store 560(output) 565
-             566:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 567 567 16 16
-             568:     11(int) Load 133(InvocationID)
-             569:     21(ptr) AccessChain 132(patch) 568 220
-             570:   18(fvec4) Load 569
-             571:     21(ptr) AccessChain 560(output) 220
-                              Store 571 570
-             572:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 573 573 16 16
-             574:     11(int) Load 133(InvocationID)
-             577:    575(ptr) AccessChain 132(patch) 574 221
-             578:   72(fvec3) Load 577
-             579:    575(ptr) AccessChain 560(output) 221
-                              Store 579 578
-             580:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 581 581 16 16
-             582:     11(int) Load 133(InvocationID)
-             583:     50(ptr) AccessChain 132(patch) 582 432
-             584:   48(fvec2) Load 583
-             585:     50(ptr) AccessChain 560(output) 432
-                              Store 585 584
-             586:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 587 587 16 16
-             588:121(HSOutput) Load 560(output)
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 135
+             138:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 137 130(patch) 41
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 140 131(InvocationID) 41
+             557:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 136 136 16 16
+             556:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 135 132(@main(struct-VSOutput-vf4-vf3-vf21[4];u1;)
+             564:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 562 562 16 16
+             563:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 561 560(output) 41
+                              Store 560(output) 567
+             569:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 570 570 16 16
+             568:     11(int) Load 131(InvocationID)
+             571:     21(ptr) AccessChain 130(patch) 568 216
+             572:   18(fvec4) Load 571
+             573:     21(ptr) AccessChain 560(output) 216
+                              Store 573 572
+             575:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 576 576 16 16
+             574:     11(int) Load 131(InvocationID)
+             579:    577(ptr) AccessChain 130(patch) 574 217
+             580:   71(fvec3) Load 579
+             581:    577(ptr) AccessChain 560(output) 217
+                              Store 581 580
+             583:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 584 584 16 16
+             582:     11(int) Load 131(InvocationID)
+             585:     50(ptr) AccessChain 130(patch) 582 430
+             586:   48(fvec2) Load 585
+             587:     50(ptr) AccessChain 560(output) 430
+                              Store 587 586
+             589:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 32 590 590 16 16
+             588:119(HSOutput) Load 560(output)
                               ReturnValue 588
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tese.out b/Test/baseResults/spv.debuginfo.hlsl.tese.out
index 2d4de4e8..774bf198 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tese.out
@@ -5,12 +5,12 @@ spv.debuginfo.hlsl.tese
 
                               Capability Tessellation
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint TessellationEvaluation 6  "main" 368 383 392 401 408 414 454 458 462 465 468 471 474
                               ExecutionMode 6 Quads
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               26:             String  "TessLevelOuter"
@@ -32,34 +32,34 @@ spv.debuginfo.hlsl.tese
               71:             String  "WorldPos"
               81:             String  "DSOutput"
               89:             String  "@main"
-              95:             String  "input"
+              93:             String  "input"
               99:             String  "TessCoord"
              102:             String  "patch"
-             112:             String  "output"
-             123:             String  "uv1"
-             126:             String  "int"
-             143:             String  "uv2"
-             167:             String  "n1"
-             179:             String  "n2"
-             202:             String  "pos1"
-             214:             String  "pos2"
-             226:             String  "pos"
-             238:             String  "type.2d.image"
-             239:             String  "@type.2d.image"
-             245:             String  "displacementMapTexture"
-             250:             String  "type.sampler"
-             251:             String  "@type.sampler"
-             256:             String  "displacementMapSampler"
-             260:             String  "type.sampled.image"
-             261:             String  "@type.sampled.image"
-             270:             String  "bool"
-             277:             String  "modelview"
-             282:             String  "lightPos"
-             286:             String  "frustumPlanes"
-             289:             String  "tessellatedEdgeSize"
-             293:             String  "viewportDim"
-             297:             String  "UBO"
-             300:             String  "ubo"
+             109:             String  "output"
+             120:             String  "uv1"
+             125:             String  "int"
+             140:             String  "uv2"
+             164:             String  "n1"
+             176:             String  "n2"
+             199:             String  "pos1"
+             211:             String  "pos2"
+             223:             String  "pos"
+             235:             String  "type.2d.image"
+             237:             String  "@type.2d.image"
+             243:             String  "displacementMapTexture"
+             249:             String  "type.sampler"
+             250:             String  "@type.sampler"
+             255:             String  "displacementMapSampler"
+             259:             String  "type.sampled.image"
+             260:             String  "@type.sampled.image"
+             269:             String  "bool"
+             276:             String  "modelview"
+             281:             String  "lightPos"
+             285:             String  "frustumPlanes"
+             288:             String  "tessellatedEdgeSize"
+             292:             String  "viewportDim"
+             296:             String  "UBO"
+             299:             String  "ubo"
                               Name 6  "main"
                               Name 24  "ConstantsHSOutput"
                               MemberName 24(ConstantsHSOutput) 0  "TessLevelOuter"
@@ -80,28 +80,28 @@ spv.debuginfo.hlsl.tese
                               Name 84  "input"
                               Name 85  "TessCoord"
                               Name 86  "patch"
-                              Name 110  "output"
-                              Name 121  "uv1"
-                              Name 141  "uv2"
-                              Name 165  "n1"
-                              Name 177  "n2"
-                              Name 200  "pos1"
-                              Name 212  "pos2"
-                              Name 224  "pos"
-                              Name 243  "displacementMapTexture"
-                              Name 254  "displacementMapSampler"
-                              Name 275  "UBO"
-                              MemberName 275(UBO) 0  "projection"
-                              MemberName 275(UBO) 1  "modelview"
-                              MemberName 275(UBO) 2  "lightPos"
-                              MemberName 275(UBO) 3  "frustumPlanes"
-                              MemberName 275(UBO) 4  "displacementFactor"
-                              MemberName 275(UBO) 5  "tessellationFactor"
-                              MemberName 275(UBO) 6  "viewportDim"
-                              MemberName 275(UBO) 7  "tessellatedEdgeSize"
-                              Name 298  "ubo"
-                              MemberName 298(ubo) 0  "ubo"
-                              Name 304  ""
+                              Name 107  "output"
+                              Name 118  "uv1"
+                              Name 138  "uv2"
+                              Name 162  "n1"
+                              Name 174  "n2"
+                              Name 197  "pos1"
+                              Name 209  "pos2"
+                              Name 221  "pos"
+                              Name 241  "displacementMapTexture"
+                              Name 253  "displacementMapSampler"
+                              Name 274  "UBO"
+                              MemberName 274(UBO) 0  "projection"
+                              MemberName 274(UBO) 1  "modelview"
+                              MemberName 274(UBO) 2  "lightPos"
+                              MemberName 274(UBO) 3  "frustumPlanes"
+                              MemberName 274(UBO) 4  "displacementFactor"
+                              MemberName 274(UBO) 5  "tessellationFactor"
+                              MemberName 274(UBO) 6  "viewportDim"
+                              MemberName 274(UBO) 7  "tessellatedEdgeSize"
+                              Name 297  "ubo"
+                              MemberName 297(ubo) 0  "ubo"
+                              Name 303  ""
                               Name 366  "input"
                               Name 368  "input.TessLevelOuter"
                               Name 383  "input.TessLevelInner"
@@ -121,27 +121,27 @@ spv.debuginfo.hlsl.tese
                               Name 468  "@entryPointOutput.LightVec"
                               Name 471  "@entryPointOutput.EyePos"
                               Name 474  "@entryPointOutput.WorldPos"
-                              Decorate 243(displacementMapTexture) DescriptorSet 0
-                              Decorate 243(displacementMapTexture) Binding 1
-                              Decorate 254(displacementMapSampler) DescriptorSet 0
-                              Decorate 254(displacementMapSampler) Binding 1
-                              Decorate 273 ArrayStride 16
-                              MemberDecorate 275(UBO) 0 RowMajor
-                              MemberDecorate 275(UBO) 0 Offset 0
-                              MemberDecorate 275(UBO) 0 MatrixStride 16
-                              MemberDecorate 275(UBO) 1 RowMajor
-                              MemberDecorate 275(UBO) 1 Offset 64
-                              MemberDecorate 275(UBO) 1 MatrixStride 16
-                              MemberDecorate 275(UBO) 2 Offset 128
-                              MemberDecorate 275(UBO) 3 Offset 144
-                              MemberDecorate 275(UBO) 4 Offset 240
-                              MemberDecorate 275(UBO) 5 Offset 244
-                              MemberDecorate 275(UBO) 6 Offset 248
-                              MemberDecorate 275(UBO) 7 Offset 256
-                              MemberDecorate 298(ubo) 0 Offset 0
-                              Decorate 298(ubo) Block
-                              Decorate 304 DescriptorSet 0
-                              Decorate 304 Binding 0
+                              Decorate 241(displacementMapTexture) DescriptorSet 0
+                              Decorate 241(displacementMapTexture) Binding 1
+                              Decorate 253(displacementMapSampler) DescriptorSet 0
+                              Decorate 253(displacementMapSampler) Binding 1
+                              Decorate 272 ArrayStride 16
+                              MemberDecorate 274(UBO) 0 RowMajor
+                              MemberDecorate 274(UBO) 0 Offset 0
+                              MemberDecorate 274(UBO) 0 MatrixStride 16
+                              MemberDecorate 274(UBO) 1 RowMajor
+                              MemberDecorate 274(UBO) 1 Offset 64
+                              MemberDecorate 274(UBO) 1 MatrixStride 16
+                              MemberDecorate 274(UBO) 2 Offset 128
+                              MemberDecorate 274(UBO) 3 Offset 144
+                              MemberDecorate 274(UBO) 4 Offset 240
+                              MemberDecorate 274(UBO) 5 Offset 244
+                              MemberDecorate 274(UBO) 6 Offset 248
+                              MemberDecorate 274(UBO) 7 Offset 256
+                              MemberDecorate 297(ubo) 0 Offset 0
+                              Decorate 297(ubo) Block
+                              Decorate 303 DescriptorSet 0
+                              Decorate 303 Binding 0
                               Decorate 368(input.TessLevelOuter) Patch
                               Decorate 368(input.TessLevelOuter) BuiltIn TessLevelOuter
                               Decorate 383(input.TessLevelInner) Patch
@@ -165,170 +165,170 @@ spv.debuginfo.hlsl.tese
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:     11(int) Constant 4
               19:             TypeArray 8(float) 18
-              20:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 18
+              20:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 18
               21:     11(int) Constant 2
               22:             TypeArray 8(float) 21
-              23:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 21
+              23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 10 21
 24(ConstantsHSOutput):             TypeStruct 19 22
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 28
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 28
               29:     11(int) Constant 51
               30:     11(int) Constant 25
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 26 20 27 29 30 16 16 17
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 26 20 27 29 30 16 16 17
               33:     11(int) Constant 52
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 32 23 27 33 30 16 16 17
+              31:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 32 23 27 33 30 16 16 17
               36:     11(int) Constant 1
               38:     11(int) Constant 5
-              37:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 36 18 27 38
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 35 36 27 16 16 37 35 16 17 25 31
+              37:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 36 18 27 38
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 35 36 27 16 16 37 35 16 17 25 31
               39:             TypePointer Function 24(ConstantsHSOutput)
               40:     11(int) Constant 7
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 34 40 16
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 34 40 16
               42:             TypeVector 8(float) 2
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 21
+              43:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 21
               44:             TypePointer Function 42(fvec2)
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 43 40 16
+              45:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 43 40 16
               46:             TypeVector 8(float) 4
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 18
+              47:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 18
               48:             TypeVector 8(float) 3
-              49:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+              49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
     50(HSOutput):             TypeStruct 46(fvec4) 48(fvec3) 42(fvec2)
               53:     11(int) Constant 44
-              51:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 52 47 27 53 14 16 16 17
+              51:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 52 47 27 53 14 16 16 17
               56:     11(int) Constant 45
               57:     11(int) Constant 35
-              54:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 55 49 27 56 57 16 16 17
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 55 49 27 56 57 16 16 17
               60:     11(int) Constant 46
               61:     11(int) Constant 31
-              58:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 59 43 27 60 61 16 16 17
-              62:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 63 36 27 16 16 37 63 16 17 51 54 58
+              58:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 59 43 27 60 61 16 16 17
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 63 36 27 16 16 37 63 16 17 51 54 58
               64:             TypeArray 50(HSOutput) 18
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 62 18
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 62 18
     66(DSOutput):             TypeStruct 46(fvec4) 48(fvec3) 42(fvec2) 48(fvec3) 48(fvec3) 48(fvec3) 48(fvec3)
               68:     11(int) Constant 57
               69:     11(int) Constant 13
-              67:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 52 47 27 68 69 16 16 17
+              67:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 52 47 27 68 69 16 16 17
               72:     11(int) Constant 63
               73:     11(int) Constant 37
-              70:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
               75:     11(int) Constant 59
-              74:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 59 43 27 75 61 16 16 17
-              76:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
-              78:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
-              79:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 81 36 27 16 16 37 81 16 17 67 70 74 76 77 78 79
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 59 43 27 75 61 16 16 17
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
+              77:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
+              78:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
+              79:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 71 49 27 72 73 16 16 17
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 81 36 27 16 16 37 81 16 17 67 70 74 76 77 78 79
               82:             TypeFunction 66(DSOutput) 39(ptr) 44(ptr) 64
-              83:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 80 34 43 62
+              83:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 80 34 43 62
               91:     11(int) Constant 68
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 89 83 27 91 16 37 89 17 91
-              94:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 95 34 27 91 16 90 18 36
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              98:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 99 43 27 91 16 90 18 21
-             101:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 102 62 27 91 16 90 18 17
-             107:     11(int) Constant 70
-             108:             TypePointer Function 66(DSOutput)
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 80 40 16
-             111:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 112 80 27 107 16 90 18
-             114:    8(float) Constant 0
-             115:   46(fvec4) ConstantComposite 114 114 114 114
-             116:   48(fvec3) ConstantComposite 114 114 114
-             117:   42(fvec2) ConstantComposite 114 114
-             118:66(DSOutput) ConstantComposite 115 116 117 116 116 116 116
-             120:     11(int) Constant 71
-             122:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 123 43 27 120 16 90 18
-             125:             TypeInt 32 1
-             127:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 126 14 18 16
-             128:    125(int) Constant 0
-             129:    125(int) Constant 2
-             131:    125(int) Constant 1
-             133:             TypePointer Function 8(float)
-             134:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 40 16
-             140:     11(int) Constant 72
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 143 43 27 140 16 90 18
-             145:    125(int) Constant 3
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 89 83 27 91 16 37 89 17 91
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 93 34 27 91 16 90 18 36
+              95:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 99 43 27 91 16 90 18 21
+             101:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 102 62 27 91 16 90 18 17
+             105:             TypePointer Function 66(DSOutput)
+             106:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 80 40 16
+             110:     11(int) Constant 70
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 109 80 27 110 16 90 18
+             113:    8(float) Constant 0
+             114:   46(fvec4) ConstantComposite 113 113 113 113
+             115:   48(fvec3) ConstantComposite 113 113 113
+             116:   42(fvec2) ConstantComposite 113 113
+             117:66(DSOutput) ConstantComposite 114 115 116 115 115 115 115
+             121:     11(int) Constant 71
+             119:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 120 43 27 121 16 90 18
+             124:             TypeInt 32 1
+             126:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 125 14 18 16
+             127:    124(int) Constant 0
+             128:    124(int) Constant 2
+             130:    124(int) Constant 1
+             132:             TypePointer Function 8(float)
+             133:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 40 16
+             141:     11(int) Constant 72
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 140 43 27 141 16 90 18
+             144:    124(int) Constant 3
              153:     11(int) Constant 73
-             162:     11(int) Constant 75
-             163:             TypePointer Function 48(fvec3)
-             164:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 40 16
-             166:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 167 49 27 162 16 90 18
-             176:     11(int) Constant 76
-             178:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 179 49 27 176 16 90 18
+             160:             TypePointer Function 48(fvec3)
+             161:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 49 40 16
+             165:     11(int) Constant 75
+             163:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 164 49 27 165 16 90 18
+             177:     11(int) Constant 76
+             175:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 176 49 27 177 16 90 18
              188:     11(int) Constant 77
-             197:     11(int) Constant 80
-             198:             TypePointer Function 46(fvec4)
-             199:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 47 40 16
-             201:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 202 47 27 197 16 90 18
-             211:     11(int) Constant 81
-             213:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 214 47 27 211 16 90 18
-             223:     11(int) Constant 82
-             225:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 226 47 27 223 16 90 18
-             235:     11(int) Constant 84
-             236:             TypeImage 8(float) 2D sampled format:Unknown
-             240:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 238 16 27 235 16 37 239 240 17
-             241:             TypePointer UniformConstant 236
-             242:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 237 16 16
-243(displacementMapTexture):    241(ptr) Variable UniformConstant
-             246:     11(int) Constant 8
-             244:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 245 237 27 235 16 37 245 243(displacementMapTexture) 246
-             248:             TypeSampler
-             249:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 250 36 27 235 16 37 251 240 17
-             252:             TypePointer UniformConstant 248
-             253:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 249 16 16
-254(displacementMapSampler):    252(ptr) Variable UniformConstant
-             255:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 256 249 27 235 16 37 256 254(displacementMapSampler) 246
-             258:             TypeSampledImage 236
-             259:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 260 16 27 235 16 37 261 240 17
-             267:             TypeMatrix 46(fvec4) 4
-             269:             TypeBool
-             271:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 270 14 21 16
-             272:   269(bool) ConstantTrue
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 47 18 272
-             273:             TypeArray 46(fvec4) 15
-             274:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 47 15
-        275(UBO):             TypeStruct 267 267 46(fvec4) 273 8(float) 8(float) 42(fvec2) 8(float)
-             278:     11(int) Constant 29
-             279:     11(int) Constant 20
-             276:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 277 268 27 278 279 16 16 17
-             280:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 277 268 27 278 279 16 16 17
-             283:     11(int) Constant 30
-             284:     11(int) Constant 17
-             281:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 282 47 27 283 284 16 16 17
-             287:     11(int) Constant 22
-             285:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 286 274 27 61 287 16 16 17
-             290:     11(int) Constant 27
-             288:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 289 10 27 57 290 16 16 17
-             291:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 289 10 27 57 290 16 16 17
-             294:     11(int) Constant 34
-             292:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 293 43 27 294 279 16 16 17
-             295:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 289 10 27 57 290 16 16 17
-             296:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 297 36 27 235 16 37 297 16 17 276 280 281 285 288 291 292 295
-        298(ubo):             TypeStruct 275(UBO)
-             299:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 300 296 27 73 73 16 16 17
-             301:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 300 36 27 235 16 37 300 16 17 299
-             302:             TypePointer Uniform 298(ubo)
-             303:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 301 21 16
-             304:    302(ptr) Variable Uniform
-             305:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 301 27 235 16 37 1 304 246
-             306:    125(int) Constant 4
-             307:             TypePointer Uniform 8(float)
-             308:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
+             195:             TypePointer Function 46(fvec4)
+             196:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 47 40 16
+             200:     11(int) Constant 80
+             198:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 199 47 27 200 16 90 18
+             212:     11(int) Constant 81
+             210:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 211 47 27 212 16 90 18
+             224:     11(int) Constant 82
+             222:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 223 47 27 224 16 90 18
+             233:             TypeImage 8(float) 2D sampled format:Unknown
+             236:     11(int) Constant 84
+             238:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 0(DebugInfoNone)
+             234:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 235 16 27 236 16 37 237 238 17
+             239:             TypePointer UniformConstant 233
+             240:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 234 16 16
+241(displacementMapTexture):    239(ptr) Variable UniformConstant
+             244:     11(int) Constant 8
+             242:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 243 234 27 236 16 37 243 241(displacementMapTexture) 244
+             247:             TypeSampler
+             248:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 249 36 27 236 16 37 250 238 17
+             251:             TypePointer UniformConstant 247
+             252:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 248 16 16
+253(displacementMapSampler):    251(ptr) Variable UniformConstant
+             254:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 255 248 27 236 16 37 255 253(displacementMapSampler) 244
+             257:             TypeSampledImage 233
+             258:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 259 16 27 236 16 37 260 238 17
+             266:             TypeMatrix 46(fvec4) 4
+             268:             TypeBool
+             270:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 269 14 21 16
+             271:   268(bool) ConstantTrue
+             267:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 47 18 271
+             272:             TypeArray 46(fvec4) 15
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 5(DebugTypeArray) 47 15
+        274(UBO):             TypeStruct 266 266 46(fvec4) 272 8(float) 8(float) 42(fvec2) 8(float)
+             277:     11(int) Constant 29
+             278:     11(int) Constant 20
+             275:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 276 267 27 277 278 16 16 17
+             279:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 276 267 27 277 278 16 16 17
+             282:     11(int) Constant 30
+             283:     11(int) Constant 17
+             280:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 281 47 27 282 283 16 16 17
+             286:     11(int) Constant 22
+             284:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 285 273 27 61 286 16 16 17
+             289:     11(int) Constant 27
+             287:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 288 10 27 57 289 16 16 17
+             290:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 288 10 27 57 289 16 16 17
+             293:     11(int) Constant 34
+             291:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 292 43 27 293 278 16 16 17
+             294:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 288 10 27 57 289 16 16 17
+             295:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 296 36 27 236 16 37 296 16 17 275 279 280 284 287 290 291 294
+        297(ubo):             TypeStruct 274(UBO)
+             298:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 299 295 27 73 73 16 16 17
+             300:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 299 36 27 236 16 37 299 16 17 298
+             301:             TypePointer Uniform 297(ubo)
+             302:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 300 21 16
+             303:    301(ptr) Variable Uniform
+             304:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 300 27 236 16 37 2 303 244
+             305:    124(int) Constant 4
+             306:             TypePointer Uniform 8(float)
+             307:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
              317:     11(int) Constant 86
-             319:             TypePointer Uniform 267
-             320:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 268 21 16
+             318:             TypePointer Uniform 266
+             319:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 267 21 16
              329:     11(int) Constant 89
-             335:     11(int) Constant 90
-             336:             TypePointer Uniform 46(fvec4)
-             337:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 47 21 16
-             347:     11(int) Constant 91
-             348:    125(int) Constant 6
-             353:     11(int) Constant 92
-             354:    125(int) Constant 5
+             333:             TypePointer Uniform 46(fvec4)
+             334:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 47 21 16
+             337:     11(int) Constant 90
+             345:    124(int) Constant 6
+             348:     11(int) Constant 91
+             351:    124(int) Constant 5
+             354:     11(int) Constant 92
              362:     11(int) Constant 93
              367:             TypePointer Input 19
 368(input.TessLevelOuter):    367(ptr) Variable Input
@@ -359,92 +359,90 @@ spv.debuginfo.hlsl.tese
 468(@entryPointOutput.LightVec):    457(ptr) Variable Output
 471(@entryPointOutput.EyePos):    457(ptr) Variable Output
 474(@entryPointOutput.WorldPos):    457(ptr) Variable Output
-                              Line 1 68 1
          6(main):           4 Function None 5
                7:             Label
       366(input):     39(ptr) Variable Function
   390(TessCoord):     44(ptr) Variable Function
       398(patch):    397(ptr) Variable Function
-446(flattenTemp):    108(ptr) Variable Function
+446(flattenTemp):    105(ptr) Variable Function
       448(param):     39(ptr) Variable Function
       450(param):     44(ptr) Variable Function
-                              Line 1 68 0
-             370:    369(ptr) AccessChain 368(input.TessLevelOuter) 128
+             370:    369(ptr) AccessChain 368(input.TessLevelOuter) 127
              371:    8(float) Load 370
-             372:    133(ptr) AccessChain 366(input) 128 128
+             372:    132(ptr) AccessChain 366(input) 127 127
                               Store 372 371
-             373:    369(ptr) AccessChain 368(input.TessLevelOuter) 131
+             373:    369(ptr) AccessChain 368(input.TessLevelOuter) 130
              374:    8(float) Load 373
-             375:    133(ptr) AccessChain 366(input) 128 131
+             375:    132(ptr) AccessChain 366(input) 127 130
                               Store 375 374
-             376:    369(ptr) AccessChain 368(input.TessLevelOuter) 129
+             376:    369(ptr) AccessChain 368(input.TessLevelOuter) 128
              377:    8(float) Load 376
-             378:    133(ptr) AccessChain 366(input) 128 129
+             378:    132(ptr) AccessChain 366(input) 127 128
                               Store 378 377
-             379:    369(ptr) AccessChain 368(input.TessLevelOuter) 145
+             379:    369(ptr) AccessChain 368(input.TessLevelOuter) 144
              380:    8(float) Load 379
-             381:    133(ptr) AccessChain 366(input) 128 145
+             381:    132(ptr) AccessChain 366(input) 127 144
                               Store 381 380
-             384:    369(ptr) AccessChain 383(input.TessLevelInner) 128
+             384:    369(ptr) AccessChain 383(input.TessLevelInner) 127
              385:    8(float) Load 384
-             386:    133(ptr) AccessChain 366(input) 131 128
+             386:    132(ptr) AccessChain 366(input) 130 127
                               Store 386 385
-             387:    369(ptr) AccessChain 383(input.TessLevelInner) 131
+             387:    369(ptr) AccessChain 383(input.TessLevelInner) 130
              388:    8(float) Load 387
-             389:    133(ptr) AccessChain 366(input) 131 131
+             389:    132(ptr) AccessChain 366(input) 130 130
                               Store 389 388
              393:   48(fvec3) Load 392(TessCoord)
              394:    8(float) CompositeExtract 393 0
              395:    8(float) CompositeExtract 393 1
              396:   42(fvec2) CompositeConstruct 394 395
                               Store 390(TessCoord) 396
-             403:    402(ptr) AccessChain 401(patch.Pos) 128
+             403:    402(ptr) AccessChain 401(patch.Pos) 127
              404:   46(fvec4) Load 403
-             405:    198(ptr) AccessChain 398(patch) 128 128
+             405:    195(ptr) AccessChain 398(patch) 127 127
                               Store 405 404
-             409:    391(ptr) AccessChain 408(patch.Normal) 128
+             409:    391(ptr) AccessChain 408(patch.Normal) 127
              410:   48(fvec3) Load 409
-             411:    163(ptr) AccessChain 398(patch) 128 131
+             411:    160(ptr) AccessChain 398(patch) 127 130
                               Store 411 410
-             416:    415(ptr) AccessChain 414(patch.UV) 128
+             416:    415(ptr) AccessChain 414(patch.UV) 127
              417:   42(fvec2) Load 416
-             418:     44(ptr) AccessChain 398(patch) 128 129
+             418:     44(ptr) AccessChain 398(patch) 127 128
                               Store 418 417
-             419:    402(ptr) AccessChain 401(patch.Pos) 131
+             419:    402(ptr) AccessChain 401(patch.Pos) 130
              420:   46(fvec4) Load 419
-             421:    198(ptr) AccessChain 398(patch) 131 128
+             421:    195(ptr) AccessChain 398(patch) 130 127
                               Store 421 420
-             422:    391(ptr) AccessChain 408(patch.Normal) 131
+             422:    391(ptr) AccessChain 408(patch.Normal) 130
              423:   48(fvec3) Load 422
-             424:    163(ptr) AccessChain 398(patch) 131 131
+             424:    160(ptr) AccessChain 398(patch) 130 130
                               Store 424 423
-             425:    415(ptr) AccessChain 414(patch.UV) 131
+             425:    415(ptr) AccessChain 414(patch.UV) 130
              426:   42(fvec2) Load 425
-             427:     44(ptr) AccessChain 398(patch) 131 129
+             427:     44(ptr) AccessChain 398(patch) 130 128
                               Store 427 426
-             428:    402(ptr) AccessChain 401(patch.Pos) 129
+             428:    402(ptr) AccessChain 401(patch.Pos) 128
              429:   46(fvec4) Load 428
-             430:    198(ptr) AccessChain 398(patch) 129 128
+             430:    195(ptr) AccessChain 398(patch) 128 127
                               Store 430 429
-             431:    391(ptr) AccessChain 408(patch.Normal) 129
+             431:    391(ptr) AccessChain 408(patch.Normal) 128
              432:   48(fvec3) Load 431
-             433:    163(ptr) AccessChain 398(patch) 129 131
+             433:    160(ptr) AccessChain 398(patch) 128 130
                               Store 433 432
-             434:    415(ptr) AccessChain 414(patch.UV) 129
+             434:    415(ptr) AccessChain 414(patch.UV) 128
              435:   42(fvec2) Load 434
-             436:     44(ptr) AccessChain 398(patch) 129 129
+             436:     44(ptr) AccessChain 398(patch) 128 128
                               Store 436 435
-             437:    402(ptr) AccessChain 401(patch.Pos) 145
+             437:    402(ptr) AccessChain 401(patch.Pos) 144
              438:   46(fvec4) Load 437
-             439:    198(ptr) AccessChain 398(patch) 145 128
+             439:    195(ptr) AccessChain 398(patch) 144 127
                               Store 439 438
-             440:    391(ptr) AccessChain 408(patch.Normal) 145
+             440:    391(ptr) AccessChain 408(patch.Normal) 144
              441:   48(fvec3) Load 440
-             442:    163(ptr) AccessChain 398(patch) 145 131
+             442:    160(ptr) AccessChain 398(patch) 144 130
                               Store 442 441
-             443:    415(ptr) AccessChain 414(patch.UV) 145
+             443:    415(ptr) AccessChain 414(patch.UV) 144
              444:   42(fvec2) Load 443
-             445:     44(ptr) AccessChain 398(patch) 145 129
+             445:     44(ptr) AccessChain 398(patch) 144 128
                               Store 445 444
              447:          64 Load 398(patch)
              449:24(ConstantsHSOutput) Load 366(input)
@@ -453,190 +451,188 @@ spv.debuginfo.hlsl.tese
                               Store 450(param) 451
              452:66(DSOutput) FunctionCall 87(@main(struct-ConstantsHSOutput-f1[4]-f1[2]1;vf2;struct-HSOutput-vf4-vf3-vf21[4];) 448(param) 450(param) 447
                               Store 446(flattenTemp) 452
-             455:    198(ptr) AccessChain 446(flattenTemp) 128
+             455:    195(ptr) AccessChain 446(flattenTemp) 127
              456:   46(fvec4) Load 455
                               Store 454(@entryPointOutput.Pos) 456
-             459:    163(ptr) AccessChain 446(flattenTemp) 131
+             459:    160(ptr) AccessChain 446(flattenTemp) 130
              460:   48(fvec3) Load 459
                               Store 458(@entryPointOutput.Normal) 460
-             463:     44(ptr) AccessChain 446(flattenTemp) 129
+             463:     44(ptr) AccessChain 446(flattenTemp) 128
              464:   42(fvec2) Load 463
                               Store 462(@entryPointOutput.UV) 464
-             466:    163(ptr) AccessChain 446(flattenTemp) 145
+             466:    160(ptr) AccessChain 446(flattenTemp) 144
              467:   48(fvec3) Load 466
                               Store 465(@entryPointOutput.ViewVec) 467
-             469:    163(ptr) AccessChain 446(flattenTemp) 306
+             469:    160(ptr) AccessChain 446(flattenTemp) 305
              470:   48(fvec3) Load 469
                               Store 468(@entryPointOutput.LightVec) 470
-             472:    163(ptr) AccessChain 446(flattenTemp) 354
+             472:    160(ptr) AccessChain 446(flattenTemp) 351
              473:   48(fvec3) Load 472
                               Store 471(@entryPointOutput.EyePos) 473
-             475:    163(ptr) AccessChain 446(flattenTemp) 348
+             475:    160(ptr) AccessChain 446(flattenTemp) 345
              476:   48(fvec3) Load 475
                               Store 474(@entryPointOutput.WorldPos) 476
                               Return
                               FunctionEnd
-                              Line 1 68 1
 87(@main(struct-ConstantsHSOutput-f1[4]-f1[2]1;vf2;struct-HSOutput-vf4-vf3-vf21[4];):66(DSOutput) Function None 82
        84(input):     39(ptr) FunctionParameter
    85(TessCoord):     44(ptr) FunctionParameter
        86(patch):          64 FunctionParameter
               88:             Label
-     110(output):    108(ptr) Variable Function
-        121(uv1):     44(ptr) Variable Function
-        141(uv2):     44(ptr) Variable Function
-         165(n1):    163(ptr) Variable Function
-         177(n2):    163(ptr) Variable Function
-       200(pos1):    198(ptr) Variable Function
-       212(pos2):    198(ptr) Variable Function
-        224(pos):    198(ptr) Variable Function
-              92:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 90
-              93:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 91 91 16 16
-              96:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 94 84(input) 97
-             100:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 98 85(TessCoord) 97
-             103:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 101 86(patch) 97
-             104:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 90 87(@main(struct-ConstantsHSOutput-f1[4]-f1[2]1;vf2;struct-HSOutput-vf4-vf3-vf21[4];)
-             105:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 90
-             106:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 107 107 16 16
-             113:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 111 110(output) 97
-                              Store 110(output) 118
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 120 120 16 16
-             124:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 122 121(uv1) 97
-             130:   42(fvec2) CompositeExtract 86(patch) 0 2
-             132:   42(fvec2) CompositeExtract 86(patch) 1 2
-             135:    133(ptr) AccessChain 85(TessCoord) 16
-             136:    8(float) Load 135
-             137:   42(fvec2) CompositeConstruct 136 136
-             138:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 130 132 137
-                              Store 121(uv1) 138
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 140 140 16 16
-             144:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 142 141(uv2) 97
-             146:   42(fvec2) CompositeExtract 86(patch) 3 2
-             147:   42(fvec2) CompositeExtract 86(patch) 2 2
-             148:    133(ptr) AccessChain 85(TessCoord) 16
-             149:    8(float) Load 148
-             150:   42(fvec2) CompositeConstruct 149 149
-             151:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 146 147 150
-                              Store 141(uv2) 151
-             152:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 153 153 16 16
-             154:   42(fvec2) Load 121(uv1)
-             155:   42(fvec2) Load 141(uv2)
-             156:    133(ptr) AccessChain 85(TessCoord) 36
-             157:    8(float) Load 156
-             158:   42(fvec2) CompositeConstruct 157 157
-             159:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 154 155 158
-             160:     44(ptr) AccessChain 110(output) 129
-                              Store 160 159
-             161:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 162 162 16 16
-             168:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 166 165(n1) 97
-             169:   48(fvec3) CompositeExtract 86(patch) 0 1
-             170:   48(fvec3) CompositeExtract 86(patch) 1 1
-             171:    133(ptr) AccessChain 85(TessCoord) 16
-             172:    8(float) Load 171
-             173:   48(fvec3) CompositeConstruct 172 172 172
-             174:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 169 170 173
-                              Store 165(n1) 174
-             175:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 176 176 16 16
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 178 177(n2) 97
-             181:   48(fvec3) CompositeExtract 86(patch) 3 1
-             182:   48(fvec3) CompositeExtract 86(patch) 2 1
-             183:    133(ptr) AccessChain 85(TessCoord) 16
-             184:    8(float) Load 183
-             185:   48(fvec3) CompositeConstruct 184 184 184
-             186:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 181 182 185
-                              Store 177(n2) 186
-             187:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 188 188 16 16
-             189:   48(fvec3) Load 165(n1)
-             190:   48(fvec3) Load 177(n2)
-             191:    133(ptr) AccessChain 85(TessCoord) 36
-             192:    8(float) Load 191
-             193:   48(fvec3) CompositeConstruct 192 192 192
-             194:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 189 190 193
-             195:    163(ptr) AccessChain 110(output) 131
-                              Store 195 194
-             196:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 197 197 16 16
-             203:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 201 200(pos1) 97
-             204:   46(fvec4) CompositeExtract 86(patch) 0 0
-             205:   46(fvec4) CompositeExtract 86(patch) 1 0
-             206:    133(ptr) AccessChain 85(TessCoord) 16
-             207:    8(float) Load 206
-             208:   46(fvec4) CompositeConstruct 207 207 207 207
-             209:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 204 205 208
-                              Store 200(pos1) 209
-             210:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 211 211 16 16
-             215:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 213 212(pos2) 97
-             216:   46(fvec4) CompositeExtract 86(patch) 3 0
-             217:   46(fvec4) CompositeExtract 86(patch) 2 0
-             218:    133(ptr) AccessChain 85(TessCoord) 16
-             219:    8(float) Load 218
-             220:   46(fvec4) CompositeConstruct 219 219 219 219
-             221:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 216 217 220
-                              Store 212(pos2) 221
-             222:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 223 223 16 16
-             227:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 225 224(pos) 97
-             228:   46(fvec4) Load 200(pos1)
-             229:   46(fvec4) Load 212(pos2)
-             230:    133(ptr) AccessChain 85(TessCoord) 36
-             231:    8(float) Load 230
-             232:   46(fvec4) CompositeConstruct 231 231 231 231
-             233:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 228 229 232
-                              Store 224(pos) 233
-             234:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 235 235 16 16
-             247:         236 Load 243(displacementMapTexture)
-             257:         248 Load 254(displacementMapSampler)
-             262:         258 SampledImage 247 257
-             263:     44(ptr) AccessChain 110(output) 129
-             264:   42(fvec2) Load 263
-             265:   46(fvec4) ImageSampleExplicitLod 262 264 Lod 114
-             266:    8(float) CompositeExtract 265 0
-             309:    307(ptr) AccessChain 304 128 306
-             310:    8(float) Load 309
-             311:    8(float) FMul 266 310
-             312:    133(ptr) AccessChain 224(pos) 36
-             313:    8(float) Load 312
-             314:    8(float) FSub 313 311
-             315:    133(ptr) AccessChain 224(pos) 36
-                              Store 315 314
-             316:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 317 317 16 16
-             318:   46(fvec4) Load 224(pos)
-             321:    319(ptr) AccessChain 304 128 131
-             322:         267 Load 321
-             323:   46(fvec4) VectorTimesMatrix 318 322
-             324:    319(ptr) AccessChain 304 128 128
-             325:         267 Load 324
-             326:   46(fvec4) VectorTimesMatrix 323 325
-             327:    198(ptr) AccessChain 110(output) 128
-                              Store 327 326
-             328:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 329 329 16 16
-             330:   46(fvec4) Load 224(pos)
-             331:   48(fvec3) VectorShuffle 330 330 0 1 2
-             332:   48(fvec3) FNegate 331
-             333:    163(ptr) AccessChain 110(output) 145
-                              Store 333 332
-             334:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 335 335 16 16
-             338:    336(ptr) AccessChain 304 128 129
-             339:   46(fvec4) Load 338
-             340:   48(fvec3) VectorShuffle 339 339 0 1 2
-             341:    163(ptr) AccessChain 110(output) 145
-             342:   48(fvec3) Load 341
-             343:   48(fvec3) FAdd 340 342
-             344:   48(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 343
-             345:    163(ptr) AccessChain 110(output) 306
-                              Store 345 344
-             346:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 347 347 16 16
-             349:   46(fvec4) Load 224(pos)
-             350:   48(fvec3) VectorShuffle 349 349 0 1 2
-             351:    163(ptr) AccessChain 110(output) 348
-                              Store 351 350
-             352:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 353 353 16 16
-             355:   46(fvec4) Load 224(pos)
-             356:    319(ptr) AccessChain 304 128 131
-             357:         267 Load 356
-             358:   46(fvec4) VectorTimesMatrix 355 357
-             359:   48(fvec3) VectorShuffle 358 358 0 1 2
-             360:    163(ptr) AccessChain 110(output) 354
-                              Store 360 359
-             361:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 362 362 16 16
-             363:66(DSOutput) Load 110(output)
-                              ReturnValue 363
+     107(output):    105(ptr) Variable Function
+        118(uv1):     44(ptr) Variable Function
+        138(uv2):     44(ptr) Variable Function
+         162(n1):    160(ptr) Variable Function
+         174(n2):    160(ptr) Variable Function
+       197(pos1):    195(ptr) Variable Function
+       209(pos2):    195(ptr) Variable Function
+        221(pos):    195(ptr) Variable Function
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 90
+              97:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 91 91 16 16
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 92 84(input) 95
+             100:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 98 85(TessCoord) 95
+             103:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 101 86(patch) 95
+             104:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 90 87(@main(struct-ConstantsHSOutput-f1[4]-f1[2]1;vf2;struct-HSOutput-vf4-vf3-vf21[4];)
+             112:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 110 110 16 16
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 108 107(output) 95
+                              Store 107(output) 117
+             123:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 121 121 16 16
+             122:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 119 118(uv1) 95
+             129:   42(fvec2) CompositeExtract 86(patch) 0 2
+             131:   42(fvec2) CompositeExtract 86(patch) 1 2
+             134:    132(ptr) AccessChain 85(TessCoord) 16
+             135:    8(float) Load 134
+             136:   42(fvec2) CompositeConstruct 135 135
+             137:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 129 131 136
+                              Store 118(uv1) 137
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 141 141 16 16
+             142:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 139 138(uv2) 95
+             145:   42(fvec2) CompositeExtract 86(patch) 3 2
+             146:   42(fvec2) CompositeExtract 86(patch) 2 2
+             147:    132(ptr) AccessChain 85(TessCoord) 16
+             148:    8(float) Load 147
+             149:   42(fvec2) CompositeConstruct 148 148
+             150:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 145 146 149
+                              Store 138(uv2) 150
+             152:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 153 153 16 16
+             151:   42(fvec2) Load 118(uv1)
+             154:   42(fvec2) Load 138(uv2)
+             155:    132(ptr) AccessChain 85(TessCoord) 36
+             156:    8(float) Load 155
+             157:   42(fvec2) CompositeConstruct 156 156
+             158:   42(fvec2) ExtInst 3(GLSL.std.450) 46(FMix) 151 154 157
+             159:     44(ptr) AccessChain 107(output) 128
+                              Store 159 158
+             167:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 165 165 16 16
+             166:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 163 162(n1) 95
+             168:   48(fvec3) CompositeExtract 86(patch) 0 1
+             169:   48(fvec3) CompositeExtract 86(patch) 1 1
+             170:    132(ptr) AccessChain 85(TessCoord) 16
+             171:    8(float) Load 170
+             172:   48(fvec3) CompositeConstruct 171 171 171
+             173:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 168 169 172
+                              Store 162(n1) 173
+             179:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 177 177 16 16
+             178:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 175 174(n2) 95
+             180:   48(fvec3) CompositeExtract 86(patch) 3 1
+             181:   48(fvec3) CompositeExtract 86(patch) 2 1
+             182:    132(ptr) AccessChain 85(TessCoord) 16
+             183:    8(float) Load 182
+             184:   48(fvec3) CompositeConstruct 183 183 183
+             185:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 180 181 184
+                              Store 174(n2) 185
+             187:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 188 188 16 16
+             186:   48(fvec3) Load 162(n1)
+             189:   48(fvec3) Load 174(n2)
+             190:    132(ptr) AccessChain 85(TessCoord) 36
+             191:    8(float) Load 190
+             192:   48(fvec3) CompositeConstruct 191 191 191
+             193:   48(fvec3) ExtInst 3(GLSL.std.450) 46(FMix) 186 189 192
+             194:    160(ptr) AccessChain 107(output) 130
+                              Store 194 193
+             202:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 200 200 16 16
+             201:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 198 197(pos1) 95
+             203:   46(fvec4) CompositeExtract 86(patch) 0 0
+             204:   46(fvec4) CompositeExtract 86(patch) 1 0
+             205:    132(ptr) AccessChain 85(TessCoord) 16
+             206:    8(float) Load 205
+             207:   46(fvec4) CompositeConstruct 206 206 206 206
+             208:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 203 204 207
+                              Store 197(pos1) 208
+             214:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 212 212 16 16
+             213:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 210 209(pos2) 95
+             215:   46(fvec4) CompositeExtract 86(patch) 3 0
+             216:   46(fvec4) CompositeExtract 86(patch) 2 0
+             217:    132(ptr) AccessChain 85(TessCoord) 16
+             218:    8(float) Load 217
+             219:   46(fvec4) CompositeConstruct 218 218 218 218
+             220:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 215 216 219
+                              Store 209(pos2) 220
+             226:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 224 224 16 16
+             225:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 222 221(pos) 95
+             227:   46(fvec4) Load 197(pos1)
+             228:   46(fvec4) Load 209(pos2)
+             229:    132(ptr) AccessChain 85(TessCoord) 36
+             230:    8(float) Load 229
+             231:   46(fvec4) CompositeConstruct 230 230 230 230
+             232:   46(fvec4) ExtInst 3(GLSL.std.450) 46(FMix) 227 228 231
+                              Store 221(pos) 232
+             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 236 236 16 16
+             245:         233 Load 241(displacementMapTexture)
+             256:         247 Load 253(displacementMapSampler)
+             261:         257 SampledImage 245 256
+             262:     44(ptr) AccessChain 107(output) 128
+             263:   42(fvec2) Load 262
+             264:   46(fvec4) ImageSampleExplicitLod 261 263 Lod 113
+             265:    8(float) CompositeExtract 264 0
+             308:    306(ptr) AccessChain 303 127 305
+             309:    8(float) Load 308
+             310:    8(float) FMul 265 309
+             311:    132(ptr) AccessChain 221(pos) 36
+             312:    8(float) Load 311
+             313:    8(float) FSub 312 310
+             314:    132(ptr) AccessChain 221(pos) 36
+                              Store 314 313
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 317 317 16 16
+             315:   46(fvec4) Load 221(pos)
+             320:    318(ptr) AccessChain 303 127 130
+             321:         266 Load 320
+             322:   46(fvec4) VectorTimesMatrix 315 321
+             323:    318(ptr) AccessChain 303 127 127
+             324:         266 Load 323
+             325:   46(fvec4) VectorTimesMatrix 322 324
+             326:    195(ptr) AccessChain 107(output) 127
+                              Store 326 325
+             328:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 329 329 16 16
+             327:   46(fvec4) Load 221(pos)
+             330:   48(fvec3) VectorShuffle 327 327 0 1 2
+             331:   48(fvec3) FNegate 330
+             332:    160(ptr) AccessChain 107(output) 144
+                              Store 332 331
+             336:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 337 337 16 16
+             335:    333(ptr) AccessChain 303 127 128
+             338:   46(fvec4) Load 335
+             339:   48(fvec3) VectorShuffle 338 338 0 1 2
+             340:    160(ptr) AccessChain 107(output) 144
+             341:   48(fvec3) Load 340
+             342:   48(fvec3) FAdd 339 341
+             343:   48(fvec3) ExtInst 3(GLSL.std.450) 69(Normalize) 342
+             344:    160(ptr) AccessChain 107(output) 305
+                              Store 344 343
+             347:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 348 348 16 16
+             346:   46(fvec4) Load 221(pos)
+             349:   48(fvec3) VectorShuffle 346 346 0 1 2
+             350:    160(ptr) AccessChain 107(output) 345
+                              Store 350 349
+             353:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 354 354 16 16
+             352:   46(fvec4) Load 221(pos)
+             355:    318(ptr) AccessChain 303 127 130
+             356:         266 Load 355
+             357:   46(fvec4) VectorTimesMatrix 352 356
+             358:   48(fvec3) VectorShuffle 357 357 0 1 2
+             359:    160(ptr) AccessChain 107(output) 351
+                              Store 359 358
+             361:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 27 362 362 16 16
+             360:66(DSOutput) Load 107(output)
+                              ReturnValue 360
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.hlsl.vert.out b/Test/baseResults/spv.debuginfo.hlsl.vert.out
index 8c08100d..55452392 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.vert.out
@@ -5,11 +5,11 @@ spv.debuginfo.hlsl.vert
 
                               Capability Shader
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Vertex 6  "main" 461 464 468 471 474 477 481 485 493 497 500 503 506 509
-               1:             String  ""
+               2:             String  ""
                9:             String  "float"
               12:             String  "uint"
               24:             String  "int"
@@ -31,24 +31,24 @@ spv.debuginfo.hlsl.vert
               66:             String  "LightVec"
               73:             String  "VSOutput"
               79:             String  "@main"
-              85:             String  "input"
-              96:             String  "output"
-             133:             String  "s"
-             141:             String  "bool"
-             146:             String  "modelview"
-             151:             String  "lightPos"
-             155:             String  "globSpeed"
-             159:             String  "UBO"
-             162:             String  "ubo"
-             181:             String  "c"
-             197:             String  "mx"
-             232:             String  "my"
-             266:             String  "mz"
-             286:             String  "rotMat"
-             316:             String  "gRotMat"
-             344:             String  "locPos"
-             358:             String  "pos"
-             424:             String  "lPos"
+              83:             String  "input"
+              93:             String  "output"
+             130:             String  "s"
+             140:             String  "bool"
+             145:             String  "modelview"
+             150:             String  "lightPos"
+             154:             String  "globSpeed"
+             158:             String  "UBO"
+             161:             String  "ubo"
+             178:             String  "c"
+             194:             String  "mx"
+             229:             String  "my"
+             263:             String  "mz"
+             283:             String  "rotMat"
+             313:             String  "gRotMat"
+             341:             String  "locPos"
+             355:             String  "pos"
+             421:             String  "lPos"
                               Name 6  "main"
                               Name 27  "VSInput"
                               MemberName 27(VSInput) 0  "Pos"
@@ -68,26 +68,26 @@ spv.debuginfo.hlsl.vert
                               MemberName 60(VSOutput) 5  "LightVec"
                               Name 77  "@main(struct-VSInput-vf3-vf3-vf2-vf3-vf3-vf3-f1-i11;"
                               Name 76  "input"
-                              Name 94  "output"
-                              Name 131  "s"
-                              Name 144  "UBO"
-                              MemberName 144(UBO) 0  "projection"
-                              MemberName 144(UBO) 1  "modelview"
-                              MemberName 144(UBO) 2  "lightPos"
-                              MemberName 144(UBO) 3  "locSpeed"
-                              MemberName 144(UBO) 4  "globSpeed"
-                              Name 160  "ubo"
-                              MemberName 160(ubo) 0  "ubo"
-                              Name 167  ""
-                              Name 179  "c"
-                              Name 195  "mx"
-                              Name 230  "my"
-                              Name 264  "mz"
-                              Name 284  "rotMat"
-                              Name 314  "gRotMat"
-                              Name 342  "locPos"
-                              Name 356  "pos"
-                              Name 422  "lPos"
+                              Name 91  "output"
+                              Name 128  "s"
+                              Name 143  "UBO"
+                              MemberName 143(UBO) 0  "projection"
+                              MemberName 143(UBO) 1  "modelview"
+                              MemberName 143(UBO) 2  "lightPos"
+                              MemberName 143(UBO) 3  "locSpeed"
+                              MemberName 143(UBO) 4  "globSpeed"
+                              Name 159  "ubo"
+                              MemberName 159(ubo) 0  "ubo"
+                              Name 166  ""
+                              Name 176  "c"
+                              Name 192  "mx"
+                              Name 227  "my"
+                              Name 261  "mz"
+                              Name 281  "rotMat"
+                              Name 311  "gRotMat"
+                              Name 339  "locPos"
+                              Name 353  "pos"
+                              Name 419  "lPos"
                               Name 459  "input"
                               Name 461  "input.Pos"
                               Name 464  "input.Normal"
@@ -105,19 +105,19 @@ spv.debuginfo.hlsl.vert
                               Name 503  "@entryPointOutput.UV"
                               Name 506  "@entryPointOutput.ViewVec"
                               Name 509  "@entryPointOutput.LightVec"
-                              MemberDecorate 144(UBO) 0 RowMajor
-                              MemberDecorate 144(UBO) 0 Offset 0
-                              MemberDecorate 144(UBO) 0 MatrixStride 16
-                              MemberDecorate 144(UBO) 1 RowMajor
-                              MemberDecorate 144(UBO) 1 Offset 64
-                              MemberDecorate 144(UBO) 1 MatrixStride 16
-                              MemberDecorate 144(UBO) 2 Offset 128
-                              MemberDecorate 144(UBO) 3 Offset 144
-                              MemberDecorate 144(UBO) 4 Offset 148
-                              MemberDecorate 160(ubo) 0 Offset 0
-                              Decorate 160(ubo) Block
-                              Decorate 167 DescriptorSet 0
-                              Decorate 167 Binding 0
+                              MemberDecorate 143(UBO) 0 RowMajor
+                              MemberDecorate 143(UBO) 0 Offset 0
+                              MemberDecorate 143(UBO) 0 MatrixStride 16
+                              MemberDecorate 143(UBO) 1 RowMajor
+                              MemberDecorate 143(UBO) 1 Offset 64
+                              MemberDecorate 143(UBO) 1 MatrixStride 16
+                              MemberDecorate 143(UBO) 2 Offset 128
+                              MemberDecorate 143(UBO) 3 Offset 144
+                              MemberDecorate 143(UBO) 4 Offset 148
+                              MemberDecorate 159(ubo) 0 Offset 0
+                              Decorate 159(ubo) Block
+                              Decorate 166 DescriptorSet 0
+                              Decorate 166 Binding 0
                               Decorate 461(input.Pos) Location 0
                               Decorate 464(input.Normal) Location 1
                               Decorate 468(input.UV) Location 2
@@ -139,166 +139,166 @@ spv.debuginfo.hlsl.vert
               14:     11(int) Constant 32
               15:     11(int) Constant 6
               16:     11(int) Constant 0
-              13:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
+              13:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 12 14 15 16
               17:     11(int) Constant 3
-              10:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
+              10:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 9 14 17 16
               18:             TypeVector 8(float) 3
-              19:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
+              19:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 17
               20:             TypeVector 8(float) 2
               21:     11(int) Constant 2
-              22:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 21
+              22:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 21
               23:             TypeInt 32 1
               26:     11(int) Constant 4
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 24 14 26 16
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 24 14 26 16
      27(VSInput):             TypeStruct 18(fvec3) 18(fvec3) 20(fvec2) 18(fvec3) 18(fvec3) 18(fvec3) 8(float) 23(int)
-              30:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 31
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 31
               32:     11(int) Constant 35
               33:     11(int) Constant 40
-              28:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
-              34:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
+              28:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
               37:     11(int) Constant 30
               38:     11(int) Constant 31
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 36 22 30 37 38 16 16 17
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
-              40:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
-              41:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
+              35:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 36 22 30 37 38 16 16 17
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
+              40:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
+              41:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 29 19 30 32 33 16 16 17
               44:     11(int) Constant 36
               45:     11(int) Constant 41
-              42:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 43 10 30 44 45 16 16 17
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 43 10 30 44 45 16 16 17
               48:     11(int) Constant 37
               49:     11(int) Constant 42
-              46:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 47 25 30 48 49 16 16 17
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 47 25 30 48 49 16 16 17
               52:     11(int) Constant 1
               54:     11(int) Constant 5
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 52 26 30 54
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 51 52 30 16 16 53 51 16 17 28 34 35 39 40 41 42 46
+              53:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 52 26 30 54
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 51 52 30 16 16 53 51 16 17 28 34 35 39 40 41 42 46
               55:             TypePointer Function 27(VSInput)
               56:     11(int) Constant 7
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 50 56 16
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 50 56 16
               58:             TypeVector 8(float) 4
-              59:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 26
+              59:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 6(DebugTypeVector) 10 26
     60(VSOutput):             TypeStruct 58(fvec4) 18(fvec3) 18(fvec3) 18(fvec3) 18(fvec3) 18(fvec3)
               63:     11(int) Constant 53
               64:     11(int) Constant 13
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 62 59 30 63 64 16 16 17
+              61:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 62 59 30 63 64 16 16 17
               67:     11(int) Constant 58
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
-              69:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
-              70:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
-              71:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 73 52 30 16 16 53 73 16 17 61 65 68 69 70 71
+              65:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
+              69:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
+              70:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
+              71:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 66 19 30 67 48 16 16 17
+              72:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 73 52 30 16 16 53 73 16 17 61 65 68 69 70 71
               74:             TypeFunction 60(VSOutput) 55(ptr)
-              75:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 72 50
+              75:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 17 72 50
               81:     11(int) Constant 62
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 79 75 30 81 16 53 79 17 81
-              84:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 85 50 30 81 16 80 26 52
-              87:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
-              91:     11(int) Constant 63
-              92:             TypePointer Function 60(VSOutput)
-              93:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 56 16
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 96 72 30 91 16 80 26
-              98:    8(float) Constant 0
-              99:   58(fvec4) ConstantComposite 98 98 98 98
-             100:   18(fvec3) ConstantComposite 98 98 98
-             101:60(VSOutput) ConstantComposite 99 100 100 100 100 100
-             103:     11(int) Constant 64
-             104:     23(int) Constant 2
-             105:     23(int) Constant 3
-             106:             TypePointer Function 18(fvec3)
-             107:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 19 56 16
-             112:     11(int) Constant 65
-             113:             TypePointer Function 20(fvec2)
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 56 16
-             117:     23(int) Constant 7
-             118:             TypePointer Function 23(int)
-             119:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 25 56 16
-             128:     11(int) Constant 68
-             129:             TypePointer Function 8(float)
-             130:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 56 16
-             132:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 133 10 30 128 16 80 26
-             135:     23(int) Constant 5
-             138:             TypeMatrix 58(fvec4) 4
-             140:             TypeBool
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 141 14 21 16
-             143:   140(bool) ConstantTrue
-             139:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 59 26 143
-        144(UBO):             TypeStruct 138 138 58(fvec4) 8(float) 8(float)
-             147:     11(int) Constant 43
-             148:     11(int) Constant 20
-             145:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 146 139 30 147 148 16 16 17
-             149:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 146 139 30 147 148 16 16 17
-             152:     11(int) Constant 44
-             153:     11(int) Constant 17
-             150:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 151 59 30 152 153 16 16 17
-             156:     11(int) Constant 46
-             154:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 155 10 30 156 153 16 16 17
-             157:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 155 10 30 156 153 16 16 17
-             158:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 159 52 30 128 16 53 159 16 17 145 149 150 154 157
-        160(ubo):             TypeStruct 144(UBO)
-             163:     11(int) Constant 49
-             161:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 162 158 30 163 48 16 16 17
-             164:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 162 52 30 128 16 53 162 16 17 161
-             165:             TypePointer Uniform 160(ubo)
-             166:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 164 21 16
-             167:    165(ptr) Variable Uniform
-             169:     11(int) Constant 8
-             168:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 1 164 30 128 16 53 1 167 169
-             170:     23(int) Constant 0
-             171:             TypePointer Uniform 8(float)
-             172:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
-             178:     11(int) Constant 69
-             180:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 181 10 30 178 16 80 26
-             190:     11(int) Constant 71
-             191:             TypeMatrix 18(fvec3) 3
-             192:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 19 17 143
-             193:             TypePointer Function 191
-             194:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 192 56 16
-             196:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 197 192 30 190 16 80 26
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 79 75 30 81 16 53 79 17 81
+              82:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 83 50 30 81 16 80 26 52
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 31(DebugExpression)
+              89:             TypePointer Function 60(VSOutput)
+              90:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 56 16
+              94:     11(int) Constant 63
+              92:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 93 72 30 94 16 80 26
+              97:    8(float) Constant 0
+              98:   58(fvec4) ConstantComposite 97 97 97 97
+              99:   18(fvec3) ConstantComposite 97 97 97
+             100:60(VSOutput) ConstantComposite 98 99 99 99 99 99
+             101:     23(int) Constant 2
+             102:     23(int) Constant 3
+             103:             TypePointer Function 18(fvec3)
+             104:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 19 56 16
+             107:     11(int) Constant 64
+             110:             TypePointer Function 20(fvec2)
+             111:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 22 56 16
+             114:     11(int) Constant 65
+             116:     23(int) Constant 7
+             117:             TypePointer Function 23(int)
+             118:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 25 56 16
+             126:             TypePointer Function 8(float)
+             127:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 56 16
+             131:     11(int) Constant 68
+             129:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 130 10 30 131 16 80 26
+             134:     23(int) Constant 5
+             137:             TypeMatrix 58(fvec4) 4
+             139:             TypeBool
+             141:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 140 14 21 16
+             142:   139(bool) ConstantTrue
+             138:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 59 26 142
+        143(UBO):             TypeStruct 137 137 58(fvec4) 8(float) 8(float)
+             146:     11(int) Constant 43
+             147:     11(int) Constant 20
+             144:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 145 138 30 146 147 16 16 17
+             148:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 145 138 30 146 147 16 16 17
+             151:     11(int) Constant 44
+             152:     11(int) Constant 17
+             149:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 150 59 30 151 152 16 16 17
+             155:     11(int) Constant 46
+             153:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 154 10 30 155 152 16 16 17
+             156:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 154 10 30 155 152 16 16 17
+             157:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 158 52 30 131 16 53 158 16 17 144 148 149 153 156
+        159(ubo):             TypeStruct 143(UBO)
+             162:     11(int) Constant 49
+             160:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 161 157 30 162 48 16 16 17
+             163:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 161 52 30 131 16 53 161 16 17 160
+             164:             TypePointer Uniform 159(ubo)
+             165:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 163 21 16
+             166:    164(ptr) Variable Uniform
+             168:     11(int) Constant 8
+             167:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 2 163 30 131 16 53 2 166 168
+             169:     23(int) Constant 0
+             170:             TypePointer Uniform 8(float)
+             171:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 10 21 16
+             179:     11(int) Constant 69
+             177:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 178 10 30 179 16 80 26
+             188:             TypeMatrix 18(fvec3) 3
+             189:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 108(DebugTypeMatrix) 19 17 142
+             190:             TypePointer Function 188
+             191:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 189 56 16
+             195:     11(int) Constant 71
+             193:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 194 189 30 195 16 80 26
              203:     11(int) Constant 72
-             206:    8(float) Constant 1065353216
+             205:    8(float) Constant 1065353216
              213:     11(int) Constant 76
              221:     11(int) Constant 77
-             229:     11(int) Constant 79
-             231:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 232 192 30 229 16 80 26
+             230:     11(int) Constant 79
+             228:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 229 189 30 230 16 80 26
              238:     11(int) Constant 81
              247:     11(int) Constant 84
              255:     11(int) Constant 85
-             263:     11(int) Constant 87
-             265:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 266 192 30 263 16 80 26
+             264:     11(int) Constant 87
+             262:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 263 189 30 264 16 80 26
              269:     11(int) Constant 88
              274:     11(int) Constant 89
-             283:     11(int) Constant 91
-             285:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 286 192 30 283 16 80 26
+             284:     11(int) Constant 91
+             282:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 283 189 30 284 16 80 26
              294:     11(int) Constant 94
-             297:     23(int) Constant 4
+             296:     23(int) Constant 4
              303:     11(int) Constant 95
-             311:     11(int) Constant 96
-             312:             TypePointer Function 138
-             313:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 139 56 16
-             315:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 316 139 30 311 16 80 26
-             322:             TypePointer Function 58(fvec4)
-             323:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 56 16
-             326:     11(int) Constant 97
-             327:     23(int) Constant 1
-             328:   58(fvec4) ConstantComposite 98 206 98 98
+             309:             TypePointer Function 137
+             310:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 138 56 16
+             314:     11(int) Constant 96
+             312:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 313 138 30 314 16 80 26
+             321:             TypePointer Function 58(fvec4)
+             322:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 56 16
+             324:     23(int) Constant 1
+             325:   58(fvec4) ConstantComposite 97 205 97 97
+             328:     11(int) Constant 97
              331:     11(int) Constant 98
-             337:     11(int) Constant 99
-             338:   58(fvec4) ConstantComposite 98 98 98 206
-             341:     11(int) Constant 101
-             343:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 344 59 30 341 16 80 26
-             355:     11(int) Constant 102
-             357:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 358 59 30 355 16 80 26
-             362:     23(int) Constant 6
+             335:   58(fvec4) ConstantComposite 97 97 97 205
+             338:     11(int) Constant 99
+             342:     11(int) Constant 101
+             340:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 341 59 30 342 16 80 26
+             356:     11(int) Constant 102
+             354:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 355 59 30 356 16 80 26
+             361:     23(int) Constant 6
              374:     11(int) Constant 104
-             378:             TypePointer Uniform 138
-             379:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 139 21 16
+             377:             TypePointer Uniform 137
+             378:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 138 21 16
              388:     11(int) Constant 105
              407:     11(int) Constant 107
-             421:     11(int) Constant 108
-             423:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 424 19 30 421 16 80 26
-             426:             TypePointer Uniform 58(fvec4)
-             427:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 21 16
+             422:     11(int) Constant 108
+             420:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 26(DebugLocalVariable) 421 19 30 422 16 80 26
+             425:             TypePointer Uniform 58(fvec4)
+             426:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 59 21 16
              442:     11(int) Constant 109
              449:     11(int) Constant 110
              455:     11(int) Constant 111
@@ -322,338 +322,334 @@ spv.debuginfo.hlsl.vert
 503(@entryPointOutput.UV):    496(ptr) Variable Output
 506(@entryPointOutput.ViewVec):    496(ptr) Variable Output
 509(@entryPointOutput.LightVec):    496(ptr) Variable Output
-                              Line 1 62 1
          6(main):           4 Function None 5
                7:             Label
       459(input):     55(ptr) Variable Function
-488(flattenTemp):     92(ptr) Variable Function
+488(flattenTemp):     89(ptr) Variable Function
       489(param):     55(ptr) Variable Function
-                              Line 1 62 0
              462:   18(fvec3) Load 461(input.Pos)
-             463:    106(ptr) AccessChain 459(input) 170
+             463:    103(ptr) AccessChain 459(input) 169
                               Store 463 462
              465:   18(fvec3) Load 464(input.Normal)
-             466:    106(ptr) AccessChain 459(input) 327
+             466:    103(ptr) AccessChain 459(input) 324
                               Store 466 465
              469:   20(fvec2) Load 468(input.UV)
-             470:    113(ptr) AccessChain 459(input) 104
+             470:    110(ptr) AccessChain 459(input) 101
                               Store 470 469
              472:   18(fvec3) Load 471(input.Color)
-             473:    106(ptr) AccessChain 459(input) 105
+             473:    103(ptr) AccessChain 459(input) 102
                               Store 473 472
              475:   18(fvec3) Load 474(input.instancePos)
-             476:    106(ptr) AccessChain 459(input) 297
+             476:    103(ptr) AccessChain 459(input) 296
                               Store 476 475
              478:   18(fvec3) Load 477(input.instanceRot)
-             479:    106(ptr) AccessChain 459(input) 135
+             479:    103(ptr) AccessChain 459(input) 134
                               Store 479 478
              482:    8(float) Load 481(input.instanceScale)
-             483:    129(ptr) AccessChain 459(input) 362
+             483:    126(ptr) AccessChain 459(input) 361
                               Store 483 482
              486:     23(int) Load 485(input.instanceTexIndex)
-             487:    118(ptr) AccessChain 459(input) 117
+             487:    117(ptr) AccessChain 459(input) 116
                               Store 487 486
              490: 27(VSInput) Load 459(input)
                               Store 489(param) 490
              491:60(VSOutput) FunctionCall 77(@main(struct-VSInput-vf3-vf3-vf2-vf3-vf3-vf3-f1-i11;) 489(param)
                               Store 488(flattenTemp) 491
-             494:    322(ptr) AccessChain 488(flattenTemp) 170
+             494:    321(ptr) AccessChain 488(flattenTemp) 169
              495:   58(fvec4) Load 494
                               Store 493(@entryPointOutput.Pos) 495
-             498:    106(ptr) AccessChain 488(flattenTemp) 327
+             498:    103(ptr) AccessChain 488(flattenTemp) 324
              499:   18(fvec3) Load 498
                               Store 497(@entryPointOutput.Normal) 499
-             501:    106(ptr) AccessChain 488(flattenTemp) 104
+             501:    103(ptr) AccessChain 488(flattenTemp) 101
              502:   18(fvec3) Load 501
                               Store 500(@entryPointOutput.Color) 502
-             504:    106(ptr) AccessChain 488(flattenTemp) 105
+             504:    103(ptr) AccessChain 488(flattenTemp) 102
              505:   18(fvec3) Load 504
                               Store 503(@entryPointOutput.UV) 505
-             507:    106(ptr) AccessChain 488(flattenTemp) 297
+             507:    103(ptr) AccessChain 488(flattenTemp) 296
              508:   18(fvec3) Load 507
                               Store 506(@entryPointOutput.ViewVec) 508
-             510:    106(ptr) AccessChain 488(flattenTemp) 135
+             510:    103(ptr) AccessChain 488(flattenTemp) 134
              511:   18(fvec3) Load 510
                               Store 509(@entryPointOutput.LightVec) 511
                               Return
                               FunctionEnd
-                              Line 1 62 1
 77(@main(struct-VSInput-vf3-vf3-vf2-vf3-vf3-vf3-f1-i11;):60(VSOutput) Function None 74
        76(input):     55(ptr) FunctionParameter
               78:             Label
-      94(output):     92(ptr) Variable Function
-          131(s):    129(ptr) Variable Function
-          179(c):    129(ptr) Variable Function
-         195(mx):    193(ptr) Variable Function
-         230(my):    193(ptr) Variable Function
-         264(mz):    193(ptr) Variable Function
-     284(rotMat):    193(ptr) Variable Function
-    314(gRotMat):    312(ptr) Variable Function
-     342(locPos):    322(ptr) Variable Function
-        356(pos):    322(ptr) Variable Function
-       422(lPos):    106(ptr) Variable Function
-              82:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 80
-              83:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 81 81 16 16
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 84 76(input) 87
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 80 77(@main(struct-VSInput-vf3-vf3-vf2-vf3-vf3-vf3-f1-i11;)
-              89:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 80
-              90:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 91 91 16 16
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 95 94(output) 87
-                              Store 94(output) 101
-             102:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 103 103 16 16
-             108:    106(ptr) AccessChain 76(input) 105
-             109:   18(fvec3) Load 108
-             110:    106(ptr) AccessChain 94(output) 104
-                              Store 110 109
-             111:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 112 112 16 16
-             115:    113(ptr) AccessChain 76(input) 104
-             116:   20(fvec2) Load 115
-             120:    118(ptr) AccessChain 76(input) 117
-             121:     23(int) Load 120
-             122:    8(float) ConvertSToF 121
-             123:    8(float) CompositeExtract 116 0
-             124:    8(float) CompositeExtract 116 1
-             125:   18(fvec3) CompositeConstruct 123 124 122
-             126:    106(ptr) AccessChain 94(output) 105
-                              Store 126 125
-             127:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 128 128 16 16
-             134:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 132 131(s) 87
-             136:    129(ptr) AccessChain 76(input) 135 16
-             137:    8(float) Load 136
-             173:    171(ptr) AccessChain 167 170 105
-             174:    8(float) Load 173
-             175:    8(float) FAdd 137 174
-             176:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 175
-                              Store 131(s) 176
-             177:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 178 178 16 16
-             182:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 180 179(c) 87
-             183:    129(ptr) AccessChain 76(input) 135 16
-             184:    8(float) Load 183
-             185:    171(ptr) AccessChain 167 170 105
-             186:    8(float) Load 185
-             187:    8(float) FAdd 184 186
-             188:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 187
-                              Store 179(c) 188
-             189:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 190 190 16 16
-             198:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 196 195(mx) 87
-             199:    8(float) Load 179(c)
-             200:    8(float) Load 131(s)
-             201:    8(float) FNegate 200
-             202:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 203 203 16 16
-             204:    8(float) Load 131(s)
-             205:    8(float) Load 179(c)
-             207:   18(fvec3) CompositeConstruct 199 201 98
-             208:   18(fvec3) CompositeConstruct 204 205 98
-             209:   18(fvec3) CompositeConstruct 98 98 206
-             210:         191 CompositeConstruct 207 208 209
-             211:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 190 190 16 16
-                              Store 195(mx) 210
-             212:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 213 213 16 16
-             214:    129(ptr) AccessChain 76(input) 135 52
-             215:    8(float) Load 214
-             216:    171(ptr) AccessChain 167 170 105
-             217:    8(float) Load 216
-             218:    8(float) FAdd 215 217
-             219:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 218
-                              Store 131(s) 219
-             220:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 221 221 16 16
-             222:    129(ptr) AccessChain 76(input) 135 52
-             223:    8(float) Load 222
-             224:    171(ptr) AccessChain 167 170 105
-             225:    8(float) Load 224
-             226:    8(float) FAdd 223 225
-             227:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 226
-                              Store 179(c) 227
-             228:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 229 229 16 16
-             233:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 231 230(my) 87
-             234:    8(float) Load 179(c)
-             235:    8(float) Load 131(s)
-             236:    8(float) FNegate 235
-             237:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 238 238 16 16
-             239:    8(float) Load 131(s)
-             240:    8(float) Load 179(c)
-             241:   18(fvec3) CompositeConstruct 234 98 236
-             242:   18(fvec3) CompositeConstruct 98 206 98
-             243:   18(fvec3) CompositeConstruct 239 98 240
-             244:         191 CompositeConstruct 241 242 243
-             245:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 229 229 16 16
-                              Store 230(my) 244
-             246:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 247 247 16 16
-             248:    129(ptr) AccessChain 76(input) 135 21
-             249:    8(float) Load 248
-             250:    171(ptr) AccessChain 167 170 105
-             251:    8(float) Load 250
-             252:    8(float) FAdd 249 251
-             253:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 252
-                              Store 131(s) 253
-             254:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 255 255 16 16
-             256:    129(ptr) AccessChain 76(input) 135 21
-             257:    8(float) Load 256
-             258:    171(ptr) AccessChain 167 170 105
-             259:    8(float) Load 258
-             260:    8(float) FAdd 257 259
-             261:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 260
-                              Store 179(c) 261
-             262:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 263 263 16 16
-             267:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 265 264(mz) 87
-             268:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 269 269 16 16
-             270:    8(float) Load 179(c)
-             271:    8(float) Load 131(s)
-             272:    8(float) FNegate 271
-             273:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 274 274 16 16
-             275:    8(float) Load 131(s)
-             276:    8(float) Load 179(c)
-             277:   18(fvec3) CompositeConstruct 206 98 98
-             278:   18(fvec3) CompositeConstruct 98 270 272
-             279:   18(fvec3) CompositeConstruct 98 275 276
-             280:         191 CompositeConstruct 277 278 279
-             281:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 263 263 16 16
-                              Store 264(mz) 280
-             282:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 283 283 16 16
-             287:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 285 284(rotMat) 87
-             288:         191 Load 195(mx)
-             289:         191 Load 230(my)
-             290:         191 MatrixTimesMatrix 288 289
-             291:         191 Load 264(mz)
-             292:         191 MatrixTimesMatrix 290 291
-                              Store 284(rotMat) 292
-             293:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 294 294 16 16
-             295:    129(ptr) AccessChain 76(input) 135 52
-             296:    8(float) Load 295
-             298:    171(ptr) AccessChain 167 170 297
-             299:    8(float) Load 298
-             300:    8(float) FAdd 296 299
-             301:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 300
-                              Store 131(s) 301
-             302:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 303 303 16 16
-             304:    129(ptr) AccessChain 76(input) 135 52
-             305:    8(float) Load 304
-             306:    171(ptr) AccessChain 167 170 297
-             307:    8(float) Load 306
-             308:    8(float) FAdd 305 307
-             309:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 308
-                              Store 179(c) 309
-             310:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 311 311 16 16
-             317:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 315 314(gRotMat) 87
-             318:    8(float) Load 179(c)
-             319:    8(float) Load 131(s)
-             320:    8(float) FNegate 319
-             321:   58(fvec4) CompositeConstruct 318 98 320 98
-             324:    322(ptr) AccessChain 314(gRotMat) 170
-                              Store 324 321
-             325:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 326 326 16 16
-             329:    322(ptr) AccessChain 314(gRotMat) 327
-                              Store 329 328
-             330:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 331 331 16 16
-             332:    8(float) Load 131(s)
-             333:    8(float) Load 179(c)
-             334:   58(fvec4) CompositeConstruct 332 98 333 98
-             335:    322(ptr) AccessChain 314(gRotMat) 104
-                              Store 335 334
-             336:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 337 337 16 16
-             339:    322(ptr) AccessChain 314(gRotMat) 105
-                              Store 339 338
-             340:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 341 341 16 16
-             345:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 343 342(locPos) 87
-             346:    106(ptr) AccessChain 76(input) 170
-             347:   18(fvec3) Load 346
-             348:         191 Load 284(rotMat)
-             349:   18(fvec3) VectorTimesMatrix 347 348
-             350:    8(float) CompositeExtract 349 0
-             351:    8(float) CompositeExtract 349 1
-             352:    8(float) CompositeExtract 349 2
-             353:   58(fvec4) CompositeConstruct 350 351 352 206
-                              Store 342(locPos) 353
-             354:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 355 355 16 16
-             359:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 357 356(pos) 87
-             360:   58(fvec4) Load 342(locPos)
-             361:   18(fvec3) VectorShuffle 360 360 0 1 2
-             363:    129(ptr) AccessChain 76(input) 362
-             364:    8(float) Load 363
-             365:   18(fvec3) VectorTimesScalar 361 364
-             366:    106(ptr) AccessChain 76(input) 297
-             367:   18(fvec3) Load 366
-             368:   18(fvec3) FAdd 365 367
-             369:    8(float) CompositeExtract 368 0
-             370:    8(float) CompositeExtract 368 1
-             371:    8(float) CompositeExtract 368 2
-             372:   58(fvec4) CompositeConstruct 369 370 371 206
-                              Store 356(pos) 372
-             373:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 374 374 16 16
-             375:   58(fvec4) Load 356(pos)
-             376:         138 Load 314(gRotMat)
-             377:   58(fvec4) VectorTimesMatrix 375 376
-             380:    378(ptr) AccessChain 167 170 327
-             381:         138 Load 380
-             382:   58(fvec4) VectorTimesMatrix 377 381
-             383:    378(ptr) AccessChain 167 170 170
-             384:         138 Load 383
-             385:   58(fvec4) VectorTimesMatrix 382 384
-             386:    322(ptr) AccessChain 94(output) 170
-                              Store 386 385
-             387:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 388 388 16 16
-             389:    106(ptr) AccessChain 76(input) 327
-             390:   18(fvec3) Load 389
-             391:         191 Load 284(rotMat)
-             392:   18(fvec3) VectorTimesMatrix 390 391
-             393:         138 Load 314(gRotMat)
-             394:    378(ptr) AccessChain 167 170 327
-             395:         138 Load 394
-             396:         138 MatrixTimesMatrix 393 395
-             397:   58(fvec4) CompositeExtract 396 0
-             398:   18(fvec3) VectorShuffle 397 397 0 1 2
-             399:   58(fvec4) CompositeExtract 396 1
-             400:   18(fvec3) VectorShuffle 399 399 0 1 2
-             401:   58(fvec4) CompositeExtract 396 2
-             402:   18(fvec3) VectorShuffle 401 401 0 1 2
-             403:         191 CompositeConstruct 398 400 402
-             404:   18(fvec3) VectorTimesMatrix 392 403
-             405:    106(ptr) AccessChain 94(output) 327
-                              Store 405 404
-             406:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 407 407 16 16
-             408:    106(ptr) AccessChain 76(input) 170
-             409:   18(fvec3) Load 408
-             410:    106(ptr) AccessChain 76(input) 297
-             411:   18(fvec3) Load 410
-             412:   18(fvec3) FAdd 409 411
-             413:    8(float) CompositeExtract 412 0
-             414:    8(float) CompositeExtract 412 1
-             415:    8(float) CompositeExtract 412 2
-             416:   58(fvec4) CompositeConstruct 413 414 415 206
-             417:    378(ptr) AccessChain 167 170 327
-             418:         138 Load 417
-             419:   58(fvec4) VectorTimesMatrix 416 418
-                              Store 356(pos) 419
-             420:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 421 421 16 16
-             425:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 423 422(lPos) 87
-             428:    426(ptr) AccessChain 167 170 104
-             429:   58(fvec4) Load 428
-             430:   18(fvec3) VectorShuffle 429 429 0 1 2
-             431:    378(ptr) AccessChain 167 170 327
-             432:         138 Load 431
-             433:   58(fvec4) CompositeExtract 432 0
-             434:   18(fvec3) VectorShuffle 433 433 0 1 2
-             435:   58(fvec4) CompositeExtract 432 1
-             436:   18(fvec3) VectorShuffle 435 435 0 1 2
-             437:   58(fvec4) CompositeExtract 432 2
-             438:   18(fvec3) VectorShuffle 437 437 0 1 2
-             439:         191 CompositeConstruct 434 436 438
-             440:   18(fvec3) VectorTimesMatrix 430 439
-                              Store 422(lPos) 440
-             441:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 442 442 16 16
-             443:   18(fvec3) Load 422(lPos)
-             444:   58(fvec4) Load 356(pos)
-             445:   18(fvec3) VectorShuffle 444 444 0 1 2
-             446:   18(fvec3) FSub 443 445
-             447:    106(ptr) AccessChain 94(output) 135
-                              Store 447 446
-             448:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 449 449 16 16
-             450:   58(fvec4) Load 356(pos)
-             451:   18(fvec3) VectorShuffle 450 450 0 1 2
-             452:   18(fvec3) FNegate 451
-             453:    106(ptr) AccessChain 94(output) 297
-                              Store 453 452
-             454:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 455 455 16 16
-             456:60(VSOutput) Load 94(output)
-                              ReturnValue 456
+      91(output):     89(ptr) Variable Function
+          128(s):    126(ptr) Variable Function
+          176(c):    126(ptr) Variable Function
+         192(mx):    190(ptr) Variable Function
+         227(my):    190(ptr) Variable Function
+         261(mz):    190(ptr) Variable Function
+     281(rotMat):    190(ptr) Variable Function
+    311(gRotMat):    309(ptr) Variable Function
+     339(locPos):    321(ptr) Variable Function
+        353(pos):    321(ptr) Variable Function
+       419(lPos):    103(ptr) Variable Function
+              86:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 80
+              87:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 81 81 16 16
+              84:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 82 76(input) 85
+              88:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 80 77(@main(struct-VSInput-vf3-vf3-vf2-vf3-vf3-vf3-f1-i11;)
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 94 94 16 16
+              95:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 92 91(output) 85
+                              Store 91(output) 100
+             106:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 107 107 16 16
+             105:    103(ptr) AccessChain 76(input) 102
+             108:   18(fvec3) Load 105
+             109:    103(ptr) AccessChain 91(output) 101
+                              Store 109 108
+             113:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 114 114 16 16
+             112:    110(ptr) AccessChain 76(input) 101
+             115:   20(fvec2) Load 112
+             119:    117(ptr) AccessChain 76(input) 116
+             120:     23(int) Load 119
+             121:    8(float) ConvertSToF 120
+             122:    8(float) CompositeExtract 115 0
+             123:    8(float) CompositeExtract 115 1
+             124:   18(fvec3) CompositeConstruct 122 123 121
+             125:    103(ptr) AccessChain 91(output) 102
+                              Store 125 124
+             133:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 131 131 16 16
+             132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 129 128(s) 85
+             135:    126(ptr) AccessChain 76(input) 134 16
+             136:    8(float) Load 135
+             172:    170(ptr) AccessChain 166 169 102
+             173:    8(float) Load 172
+             174:    8(float) FAdd 136 173
+             175:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 174
+                              Store 128(s) 175
+             181:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 179 179 16 16
+             180:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 177 176(c) 85
+             182:    126(ptr) AccessChain 76(input) 134 16
+             183:    8(float) Load 182
+             184:    170(ptr) AccessChain 166 169 102
+             185:    8(float) Load 184
+             186:    8(float) FAdd 183 185
+             187:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 186
+                              Store 176(c) 187
+             197:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 195 195 16 16
+             196:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 193 192(mx) 85
+             198:    8(float) Load 176(c)
+             199:    8(float) Load 128(s)
+             200:    8(float) FNegate 199
+             202:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 203 203 16 16
+             201:    8(float) Load 128(s)
+             204:    8(float) Load 176(c)
+             206:   18(fvec3) CompositeConstruct 198 200 97
+             207:   18(fvec3) CompositeConstruct 201 204 97
+             208:   18(fvec3) CompositeConstruct 97 97 205
+             209:         188 CompositeConstruct 206 207 208
+             210:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 195 195 16 16
+                              Store 192(mx) 209
+             212:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 213 213 16 16
+             211:    126(ptr) AccessChain 76(input) 134 52
+             214:    8(float) Load 211
+             215:    170(ptr) AccessChain 166 169 102
+             216:    8(float) Load 215
+             217:    8(float) FAdd 214 216
+             218:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 217
+                              Store 128(s) 218
+             220:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 221 221 16 16
+             219:    126(ptr) AccessChain 76(input) 134 52
+             222:    8(float) Load 219
+             223:    170(ptr) AccessChain 166 169 102
+             224:    8(float) Load 223
+             225:    8(float) FAdd 222 224
+             226:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 225
+                              Store 176(c) 226
+             232:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 230 230 16 16
+             231:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 228 227(my) 85
+             233:    8(float) Load 176(c)
+             234:    8(float) Load 128(s)
+             235:    8(float) FNegate 234
+             237:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 238 238 16 16
+             236:    8(float) Load 128(s)
+             239:    8(float) Load 176(c)
+             240:   18(fvec3) CompositeConstruct 233 97 235
+             241:   18(fvec3) CompositeConstruct 97 205 97
+             242:   18(fvec3) CompositeConstruct 236 97 239
+             243:         188 CompositeConstruct 240 241 242
+             244:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 230 230 16 16
+                              Store 227(my) 243
+             246:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 247 247 16 16
+             245:    126(ptr) AccessChain 76(input) 134 21
+             248:    8(float) Load 245
+             249:    170(ptr) AccessChain 166 169 102
+             250:    8(float) Load 249
+             251:    8(float) FAdd 248 250
+             252:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 251
+                              Store 128(s) 252
+             254:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 255 255 16 16
+             253:    126(ptr) AccessChain 76(input) 134 21
+             256:    8(float) Load 253
+             257:    170(ptr) AccessChain 166 169 102
+             258:    8(float) Load 257
+             259:    8(float) FAdd 256 258
+             260:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 259
+                              Store 176(c) 260
+             266:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 264 264 16 16
+             265:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 262 261(mz) 85
+             268:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 269 269 16 16
+             267:    8(float) Load 176(c)
+             270:    8(float) Load 128(s)
+             271:    8(float) FNegate 270
+             273:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 274 274 16 16
+             272:    8(float) Load 128(s)
+             275:    8(float) Load 176(c)
+             276:   18(fvec3) CompositeConstruct 205 97 97
+             277:   18(fvec3) CompositeConstruct 97 267 271
+             278:   18(fvec3) CompositeConstruct 97 272 275
+             279:         188 CompositeConstruct 276 277 278
+             280:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 264 264 16 16
+                              Store 261(mz) 279
+             286:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 284 284 16 16
+             285:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 282 281(rotMat) 85
+             287:         188 Load 192(mx)
+             288:         188 Load 227(my)
+             289:         188 MatrixTimesMatrix 287 288
+             290:         188 Load 261(mz)
+             291:         188 MatrixTimesMatrix 289 290
+                              Store 281(rotMat) 291
+             293:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 294 294 16 16
+             292:    126(ptr) AccessChain 76(input) 134 52
+             295:    8(float) Load 292
+             297:    170(ptr) AccessChain 166 169 296
+             298:    8(float) Load 297
+             299:    8(float) FAdd 295 298
+             300:    8(float) ExtInst 3(GLSL.std.450) 13(Sin) 299
+                              Store 128(s) 300
+             302:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 303 303 16 16
+             301:    126(ptr) AccessChain 76(input) 134 52
+             304:    8(float) Load 301
+             305:    170(ptr) AccessChain 166 169 296
+             306:    8(float) Load 305
+             307:    8(float) FAdd 304 306
+             308:    8(float) ExtInst 3(GLSL.std.450) 14(Cos) 307
+                              Store 176(c) 308
+             316:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 314 314 16 16
+             315:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 312 311(gRotMat) 85
+             317:    8(float) Load 176(c)
+             318:    8(float) Load 128(s)
+             319:    8(float) FNegate 318
+             320:   58(fvec4) CompositeConstruct 317 97 319 97
+             323:    321(ptr) AccessChain 311(gRotMat) 169
+                              Store 323 320
+             327:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 328 328 16 16
+             326:    321(ptr) AccessChain 311(gRotMat) 324
+                              Store 326 325
+             330:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 331 331 16 16
+             329:    8(float) Load 128(s)
+             332:    8(float) Load 176(c)
+             333:   58(fvec4) CompositeConstruct 329 97 332 97
+             334:    321(ptr) AccessChain 311(gRotMat) 101
+                              Store 334 333
+             337:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 338 338 16 16
+             336:    321(ptr) AccessChain 311(gRotMat) 102
+                              Store 336 335
+             344:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 342 342 16 16
+             343:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 340 339(locPos) 85
+             345:    103(ptr) AccessChain 76(input) 169
+             346:   18(fvec3) Load 345
+             347:         188 Load 281(rotMat)
+             348:   18(fvec3) VectorTimesMatrix 346 347
+             349:    8(float) CompositeExtract 348 0
+             350:    8(float) CompositeExtract 348 1
+             351:    8(float) CompositeExtract 348 2
+             352:   58(fvec4) CompositeConstruct 349 350 351 205
+                              Store 339(locPos) 352
+             358:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 356 356 16 16
+             357:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 354 353(pos) 85
+             359:   58(fvec4) Load 339(locPos)
+             360:   18(fvec3) VectorShuffle 359 359 0 1 2
+             362:    126(ptr) AccessChain 76(input) 361
+             363:    8(float) Load 362
+             364:   18(fvec3) VectorTimesScalar 360 363
+             365:    103(ptr) AccessChain 76(input) 296
+             366:   18(fvec3) Load 365
+             367:   18(fvec3) FAdd 364 366
+             368:    8(float) CompositeExtract 367 0
+             369:    8(float) CompositeExtract 367 1
+             370:    8(float) CompositeExtract 367 2
+             371:   58(fvec4) CompositeConstruct 368 369 370 205
+                              Store 353(pos) 371
+             373:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 374 374 16 16
+             372:   58(fvec4) Load 353(pos)
+             375:         137 Load 311(gRotMat)
+             376:   58(fvec4) VectorTimesMatrix 372 375
+             379:    377(ptr) AccessChain 166 169 324
+             380:         137 Load 379
+             381:   58(fvec4) VectorTimesMatrix 376 380
+             382:    377(ptr) AccessChain 166 169 169
+             383:         137 Load 382
+             384:   58(fvec4) VectorTimesMatrix 381 383
+             385:    321(ptr) AccessChain 91(output) 169
+                              Store 385 384
+             387:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 388 388 16 16
+             386:    103(ptr) AccessChain 76(input) 324
+             389:   18(fvec3) Load 386
+             390:         188 Load 281(rotMat)
+             391:   18(fvec3) VectorTimesMatrix 389 390
+             392:         137 Load 311(gRotMat)
+             393:    377(ptr) AccessChain 166 169 324
+             394:         137 Load 393
+             395:         137 MatrixTimesMatrix 392 394
+             396:   58(fvec4) CompositeExtract 395 0
+             397:   18(fvec3) VectorShuffle 396 396 0 1 2
+             398:   58(fvec4) CompositeExtract 395 1
+             399:   18(fvec3) VectorShuffle 398 398 0 1 2
+             400:   58(fvec4) CompositeExtract 395 2
+             401:   18(fvec3) VectorShuffle 400 400 0 1 2
+             402:         188 CompositeConstruct 397 399 401
+             403:   18(fvec3) VectorTimesMatrix 391 402
+             404:    103(ptr) AccessChain 91(output) 324
+                              Store 404 403
+             406:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 407 407 16 16
+             405:    103(ptr) AccessChain 76(input) 169
+             408:   18(fvec3) Load 405
+             409:    103(ptr) AccessChain 76(input) 296
+             410:   18(fvec3) Load 409
+             411:   18(fvec3) FAdd 408 410
+             412:    8(float) CompositeExtract 411 0
+             413:    8(float) CompositeExtract 411 1
+             414:    8(float) CompositeExtract 411 2
+             415:   58(fvec4) CompositeConstruct 412 413 414 205
+             416:    377(ptr) AccessChain 166 169 324
+             417:         137 Load 416
+             418:   58(fvec4) VectorTimesMatrix 415 417
+                              Store 353(pos) 418
+             424:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 422 422 16 16
+             423:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 28(DebugDeclare) 420 419(lPos) 85
+             427:    425(ptr) AccessChain 166 169 101
+             428:   58(fvec4) Load 427
+             429:   18(fvec3) VectorShuffle 428 428 0 1 2
+             430:    377(ptr) AccessChain 166 169 324
+             431:         137 Load 430
+             432:   58(fvec4) CompositeExtract 431 0
+             433:   18(fvec3) VectorShuffle 432 432 0 1 2
+             434:   58(fvec4) CompositeExtract 431 1
+             435:   18(fvec3) VectorShuffle 434 434 0 1 2
+             436:   58(fvec4) CompositeExtract 431 2
+             437:   18(fvec3) VectorShuffle 436 436 0 1 2
+             438:         188 CompositeConstruct 433 435 437
+             439:   18(fvec3) VectorTimesMatrix 429 438
+                              Store 419(lPos) 439
+             441:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 442 442 16 16
+             440:   18(fvec3) Load 419(lPos)
+             443:   58(fvec4) Load 353(pos)
+             444:   18(fvec3) VectorShuffle 443 443 0 1 2
+             445:   18(fvec3) FSub 440 444
+             446:    103(ptr) AccessChain 91(output) 134
+                              Store 446 445
+             448:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 449 449 16 16
+             447:   58(fvec4) Load 353(pos)
+             450:   18(fvec3) VectorShuffle 447 447 0 1 2
+             451:   18(fvec3) FNegate 450
+             452:    103(ptr) AccessChain 91(output) 296
+                              Store 452 451
+             454:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 30 455 455 16 16
+             453:60(VSOutput) Load 91(output)
+                              ReturnValue 453
                               FunctionEnd
diff --git a/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out b/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
index e17bf1a9..4262ad03 100644
--- a/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
@@ -1,7 +1,7 @@
 spv.debuginfo.scalar_types.glsl.frag
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 158
+// Id's are bound by 159
 
                               Capability Shader
                               Capability Float16
@@ -10,12 +10,12 @@ spv.debuginfo.scalar_types.glsl.frag
                               Capability Int16
                               Capability Int8
                               Extension  "SPV_KHR_non_semantic_info"
-               2:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
+               1:             ExtInstImport  "NonSemantic.Shader.DebugInfo.100"
                3:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
                               EntryPoint Fragment 14  "main"
                               ExecutionMode 14 OriginUpperLeft
-               1:             String  ""
+               2:             String  ""
                8:             String  "uint"
               16:             String  "main"
               19:             String  "// OpModuleProcessed auto-map-locations
@@ -26,183 +26,183 @@ spv.debuginfo.scalar_types.glsl.frag
 // OpModuleProcessed entry-point main
 #line 1
 "
-              30:             String  "bool"
-              36:             String  "VAR_bool"
-              42:             String  "int"
-              48:             String  "VAR_int"
-              56:             String  "VAR_uint"
-              60:             String  "float"
-              66:             String  "VAR_float"
-              71:             String  "double"
-              78:             String  "VAR_double"
-              83:             String  "int8_t"
-              89:             String  "VAR_int8_t"
-              94:             String  "uint8_t"
-             100:             String  "VAR_uint8_t"
-             105:             String  "int16_t"
-             112:             String  "VAR_int16_t"
-             117:             String  "uint16_t"
-             123:             String  "VAR_uint16_t"
-             128:             String  "int64_t"
-             134:             String  "VAR_int64_t"
-             139:             String  "uint64_t"
-             145:             String  "VAR_uint64_t"
-             150:             String  "float16_t"
-             156:             String  "VAR_float16_t"
+              29:             String  "bool"
+              35:             String  "VAR_bool"
+              41:             String  "int"
+              47:             String  "VAR_int"
+              55:             String  "VAR_uint"
+              59:             String  "float"
+              65:             String  "VAR_float"
+              70:             String  "double"
+              77:             String  "VAR_double"
+              82:             String  "int8_t"
+              88:             String  "VAR_int8_t"
+              93:             String  "uint8_t"
+              99:             String  "VAR_uint8_t"
+             104:             String  "int16_t"
+             111:             String  "VAR_int16_t"
+             116:             String  "uint16_t"
+             122:             String  "VAR_uint16_t"
+             127:             String  "int64_t"
+             133:             String  "VAR_int64_t"
+             138:             String  "uint64_t"
+             144:             String  "VAR_uint64_t"
+             149:             String  "float16_t"
+             155:             String  "VAR_float16_t"
                               SourceExtension  "GL_EXT_shader_explicit_arithmetic_types"
                               Name 14  "main"
-                              Name 34  "VAR_bool"
-                              Name 46  "VAR_int"
-                              Name 54  "VAR_uint"
-                              Name 64  "VAR_float"
-                              Name 76  "VAR_double"
-                              Name 87  "VAR_int8_t"
-                              Name 98  "VAR_uint8_t"
-                              Name 110  "VAR_int16_t"
-                              Name 121  "VAR_uint16_t"
-                              Name 132  "VAR_int64_t"
-                              Name 143  "VAR_uint64_t"
-                              Name 154  "VAR_float16_t"
+                              Name 33  "VAR_bool"
+                              Name 45  "VAR_int"
+                              Name 53  "VAR_uint"
+                              Name 63  "VAR_float"
+                              Name 75  "VAR_double"
+                              Name 86  "VAR_int8_t"
+                              Name 97  "VAR_uint8_t"
+                              Name 109  "VAR_int16_t"
+                              Name 120  "VAR_uint16_t"
+                              Name 131  "VAR_int64_t"
+                              Name 142  "VAR_uint64_t"
+                              Name 153  "VAR_float16_t"
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
               10:      7(int) Constant 32
               11:      7(int) Constant 6
               12:      7(int) Constant 0
-               9:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
+               9:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 8 10 11 12
               13:      7(int) Constant 3
-               6:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
-              18:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 1 19
+               6:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 8(DebugTypeFunction) 13 4
+              18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               20:      7(int) Constant 42
               22:      7(int) Constant 1
               23:      7(int) Constant 4
               24:      7(int) Constant 2
-              21:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
-              17:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
-              28:      7(int) Constant 43
-              29:             TypeBool
-              31:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 30 10 24 12
-              32:             TypePointer Private 29(bool)
-              33:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 31 11 12
-    34(VAR_bool):     32(ptr) Variable Private
+              21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 1(DebugCompilationUnit) 22 23 18 24
+              17:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 20(DebugFunction) 16 6 18 20 12 21 16 13 20
+              28:             TypeBool
+              30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 29 10 24 12
+              31:             TypePointer Private 28(bool)
+              32:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 30 11 12
+    33(VAR_bool):     31(ptr) Variable Private
+              36:      7(int) Constant 43
               37:      7(int) Constant 8
-              35:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 36 31 18 28 12 21 36 34(VAR_bool) 37
-              38:    29(bool) ConstantFalse
-              40:      7(int) Constant 44
-              41:             TypeInt 32 1
-              43:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 42 10 23 12
-              44:             TypePointer Private 41(int)
-              45:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 43 11 12
-     46(VAR_int):     44(ptr) Variable Private
-              47:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 48 43 18 40 12 21 48 46(VAR_int) 37
-              49:     41(int) Constant 0
-              51:      7(int) Constant 45
-              52:             TypePointer Private 7(int)
-              53:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 11 12
-    54(VAR_uint):     52(ptr) Variable Private
-              55:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 56 9 18 51 12 21 56 54(VAR_uint) 37
-              58:      7(int) Constant 46
-              59:             TypeFloat 32
-              61:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 60 10 13 12
-              62:             TypePointer Private 59(float)
-              63:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 61 11 12
-   64(VAR_float):     62(ptr) Variable Private
-              65:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 66 61 18 58 12 21 66 64(VAR_float) 37
-              67:   59(float) Constant 0
-              69:      7(int) Constant 47
-              70:             TypeFloat 64
-              73:      7(int) Constant 64
-              72:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 71 73 13 12
-              74:             TypePointer Private 70(float64_t)
-              75:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 72 11 12
-  76(VAR_double):     74(ptr) Variable Private
-              77:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 78 72 18 69 12 21 78 76(VAR_double) 37
-              79:70(float64_t) Constant 0 0
-              81:      7(int) Constant 48
-              82:             TypeInt 8 1
-              84:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 83 37 23 12
-              85:             TypePointer Private 82(int8_t)
-              86:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 84 11 12
-  87(VAR_int8_t):     85(ptr) Variable Private
-              88:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 89 84 18 81 12 21 89 87(VAR_int8_t) 37
-              90:  82(int8_t) Constant 0
-              92:      7(int) Constant 49
-              93:             TypeInt 8 0
-              95:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 94 37 11 12
-              96:             TypePointer Private 93(int8_t)
-              97:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 95 11 12
- 98(VAR_uint8_t):     96(ptr) Variable Private
-              99:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 100 95 18 92 12 21 100 98(VAR_uint8_t) 37
-             101:  93(int8_t) Constant 0
-             103:      7(int) Constant 50
-             104:             TypeInt 16 1
-             107:      7(int) Constant 16
-             106:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 105 107 23 12
-             108:             TypePointer Private 104(int16_t)
-             109:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 106 11 12
-110(VAR_int16_t):    108(ptr) Variable Private
-             111:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 112 106 18 103 12 21 112 110(VAR_int16_t) 37
-             113:104(int16_t) Constant 0
-             115:      7(int) Constant 51
-             116:             TypeInt 16 0
-             118:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 117 107 11 12
-             119:             TypePointer Private 116(int16_t)
-             120:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 118 11 12
-121(VAR_uint16_t):    119(ptr) Variable Private
-             122:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 123 118 18 115 12 21 123 121(VAR_uint16_t) 37
-             124:116(int16_t) Constant 0
-             126:      7(int) Constant 52
-             127:             TypeInt 64 1
-             129:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 128 73 23 12
-             130:             TypePointer Private 127(int64_t)
-             131:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 129 11 12
-132(VAR_int64_t):    130(ptr) Variable Private
-             133:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 134 129 18 126 12 21 134 132(VAR_int64_t) 37
-             135:127(int64_t) Constant 0 0
-             137:      7(int) Constant 53
-             138:             TypeInt 64 0
-             140:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 139 73 11 12
-             141:             TypePointer Private 138(int64_t)
-             142:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 140 11 12
-143(VAR_uint64_t):    141(ptr) Variable Private
-             144:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 145 140 18 137 12 21 145 143(VAR_uint64_t) 37
-             146:138(int64_t) Constant 0 0
-             148:      7(int) Constant 54
-             149:             TypeFloat 16
-             151:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 150 107 13 12
-             152:             TypePointer Private 149(float16_t)
-             153:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 151 11 12
-154(VAR_float16_t):    152(ptr) Variable Private
-             155:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 156 151 18 148 12 21 156 154(VAR_float16_t) 37
-             157:149(float16_t) Constant 0
-                              Line 1 42 11
+              34:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 35 30 18 36 12 21 35 33(VAR_bool) 37
+              38:    28(bool) ConstantFalse
+              40:             TypeInt 32 1
+              42:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 41 10 23 12
+              43:             TypePointer Private 40(int)
+              44:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 42 11 12
+     45(VAR_int):     43(ptr) Variable Private
+              48:      7(int) Constant 44
+              46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 47 42 18 48 12 21 47 45(VAR_int) 37
+              49:     40(int) Constant 0
+              51:             TypePointer Private 7(int)
+              52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 9 11 12
+    53(VAR_uint):     51(ptr) Variable Private
+              56:      7(int) Constant 45
+              54:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 55 9 18 56 12 21 55 53(VAR_uint) 37
+              58:             TypeFloat 32
+              60:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 59 10 13 12
+              61:             TypePointer Private 58(float)
+              62:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 60 11 12
+   63(VAR_float):     61(ptr) Variable Private
+              66:      7(int) Constant 46
+              64:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 65 60 18 66 12 21 65 63(VAR_float) 37
+              67:   58(float) Constant 0
+              69:             TypeFloat 64
+              72:      7(int) Constant 64
+              71:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 70 72 13 12
+              73:             TypePointer Private 69(float64_t)
+              74:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 71 11 12
+  75(VAR_double):     73(ptr) Variable Private
+              78:      7(int) Constant 47
+              76:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 77 71 18 78 12 21 77 75(VAR_double) 37
+              79:69(float64_t) Constant 0 0
+              81:             TypeInt 8 1
+              83:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 82 37 23 12
+              84:             TypePointer Private 81(int8_t)
+              85:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 83 11 12
+  86(VAR_int8_t):     84(ptr) Variable Private
+              89:      7(int) Constant 48
+              87:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 88 83 18 89 12 21 88 86(VAR_int8_t) 37
+              90:  81(int8_t) Constant 0
+              92:             TypeInt 8 0
+              94:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 93 37 11 12
+              95:             TypePointer Private 92(int8_t)
+              96:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 94 11 12
+ 97(VAR_uint8_t):     95(ptr) Variable Private
+             100:      7(int) Constant 49
+              98:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 99 94 18 100 12 21 99 97(VAR_uint8_t) 37
+             101:  92(int8_t) Constant 0
+             103:             TypeInt 16 1
+             106:      7(int) Constant 16
+             105:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 104 106 23 12
+             107:             TypePointer Private 103(int16_t)
+             108:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 105 11 12
+109(VAR_int16_t):    107(ptr) Variable Private
+             112:      7(int) Constant 50
+             110:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 111 105 18 112 12 21 111 109(VAR_int16_t) 37
+             113:103(int16_t) Constant 0
+             115:             TypeInt 16 0
+             117:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 116 106 11 12
+             118:             TypePointer Private 115(int16_t)
+             119:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 117 11 12
+120(VAR_uint16_t):    118(ptr) Variable Private
+             123:      7(int) Constant 51
+             121:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 122 117 18 123 12 21 122 120(VAR_uint16_t) 37
+             124:115(int16_t) Constant 0
+             126:             TypeInt 64 1
+             128:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 127 72 23 12
+             129:             TypePointer Private 126(int64_t)
+             130:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 128 11 12
+131(VAR_int64_t):    129(ptr) Variable Private
+             134:      7(int) Constant 52
+             132:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 133 128 18 134 12 21 133 131(VAR_int64_t) 37
+             135:126(int64_t) Constant 0 0
+             137:             TypeInt 64 0
+             139:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 138 72 11 12
+             140:             TypePointer Private 137(int64_t)
+             141:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 139 11 12
+142(VAR_uint64_t):    140(ptr) Variable Private
+             145:      7(int) Constant 53
+             143:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 144 139 18 145 12 21 144 142(VAR_uint64_t) 37
+             146:137(int64_t) Constant 0 0
+             148:             TypeFloat 16
+             150:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 2(DebugTypeBasic) 149 106 13 12
+             151:             TypePointer Private 148(float16_t)
+             152:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 150 11 12
+153(VAR_float16_t):    151(ptr) Variable Private
+             156:      7(int) Constant 54
+             154:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 18(DebugGlobalVariable) 155 150 18 156 12 21 155 153(VAR_float16_t) 37
+             157:148(float16_t) Constant 0
         14(main):           4 Function None 5
               15:             Label
-              25:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
-              26:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
-              27:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 28 28 12 12
-                              Store 34(VAR_bool) 38
-              39:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 40 40 12 12
-                              Store 46(VAR_int) 49
-              50:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 51 51 12 12
-                              Store 54(VAR_uint) 12
-              57:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 58 58 12 12
-                              Store 64(VAR_float) 67
-              68:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 69 69 12 12
-                              Store 76(VAR_double) 79
-              80:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 81 81 12 12
-                              Store 87(VAR_int8_t) 90
-              91:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 92 92 12 12
-                              Store 98(VAR_uint8_t) 101
-             102:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 103 103 12 12
-                              Store 110(VAR_int16_t) 113
-             114:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 115 115 12 12
-                              Store 121(VAR_uint16_t) 124
-             125:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 126 126 12 12
-                              Store 132(VAR_int64_t) 135
-             136:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 137 137 12 12
-                              Store 143(VAR_uint64_t) 146
-             147:           4 ExtInst 2(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 148 148 12 12
-                              Store 154(VAR_float16_t) 157
+              26:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
+              27:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 20 20 12 12
+              25:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 101(DebugFunctionDefinition) 17 14(main)
+              39:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 36 36 12 12
+                              Store 33(VAR_bool) 38
+              50:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 48 48 12 12
+                              Store 45(VAR_int) 49
+              57:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 56 56 12 12
+                              Store 53(VAR_uint) 12
+              68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 66 66 12 12
+                              Store 63(VAR_float) 67
+              80:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 78 78 12 12
+                              Store 75(VAR_double) 79
+              91:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 89 89 12 12
+                              Store 86(VAR_int8_t) 90
+             102:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 100 100 12 12
+                              Store 97(VAR_uint8_t) 101
+             114:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 112 112 12 12
+                              Store 109(VAR_int16_t) 113
+             125:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 123 123 12 12
+                              Store 120(VAR_uint16_t) 124
+             136:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 134 134 12 12
+                              Store 131(VAR_int64_t) 135
+             147:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 145 145 12 12
+                              Store 142(VAR_uint64_t) 146
+             158:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 103(DebugLine) 18 156 156 12 12
+                              Store 153(VAR_float16_t) 157
                               Return
                               FunctionEnd