diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 06b33ff31c..90c3b22bf8 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1679,20 +1679,32 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
         }
         builder.setDebugMainSourceFile(glslangIntermediate->getSourceFile());
 
-        // Set the source shader's text. If for SPV version 1.0, include
+        // Set the source shader's text
+        std::string text;
+
+        // If for SPV version 1.0, include
         // a preamble in comments stating the OpModuleProcessed instructions.
         // Otherwise, emit those as actual instructions.
-        std::string text;
+        //
+        // ...Except when using ShaderDebugInfo we DON'T want these as it will mess up the line
+        // number, instead the user has opt'ed in for ShaderDebugInfo instead, so they will want
+        // to parse those instead
+        // https://github.com/KhronosGroup/glslang/issues/3863
+        const bool add_comments =
+            glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_1 && !options.emitNonSemanticShaderDebugSource;
+
         const std::vector<std::string>& processes = glslangIntermediate->getProcesses();
         for (int p = 0; p < (int)processes.size(); ++p) {
-            if (glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_1) {
+            if (add_comments) {
                 text.append("// OpModuleProcessed ");
                 text.append(processes[p]);
                 text.append("\n");
-            } else
+            } else if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_1) {
+                // OpModuleProcessed added in SPIR-V 1.1
                 builder.addModuleProcessed(processes[p]);
+            }
         }
-        if (glslangIntermediate->getSpv().spv < glslang::EShTargetSpv_1_1 && (int)processes.size() > 0)
+        if (add_comments && (int)processes.size() > 0)
             text.append("#line 1\n");
         text.append(glslangIntermediate->getSourceText());
         builder.setSourceText(text);
diff --git a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
index 354cf30ad8..cd52797f5a 100644
--- a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
@@ -17,14 +17,7 @@ spv.debuginfo.bufferref.glsl.frag
                2:             String  "spv.debuginfo.bufferref.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 450 core
+              19:             String  "#version 450 core
 #extension GL_EXT_buffer_reference : enable
 
 layout(buffer_reference, std430) buffer MeshVertexPositions {
diff --git a/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out b/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
index c36a72de2f..5c645042e5 100644
--- a/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.const_params.glsl.comp.out
@@ -14,14 +14,7 @@ spv.debuginfo.const_params.glsl.comp
                8:             String  "uint"
               17:             String  "float"
               35:             String  "function"
-              38:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 450
+              38:             String  "#version 450
 
 void function(
     const float f,
diff --git a/Test/baseResults/spv.debuginfo.const_variables.glsl.frag.out b/Test/baseResults/spv.debuginfo.const_variables.glsl.frag.out
index f6fd49d43c..b29334911a 100644
--- a/Test/baseResults/spv.debuginfo.const_variables.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.const_variables.glsl.frag.out
@@ -13,14 +13,7 @@ spv.debuginfo.const_variables.glsl.frag
                2:             String  "spv.debuginfo.const_variables.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 const vec4 constGlobal = vec4(1.0, 0.0, 0.0, 1.0);
 
diff --git a/Test/baseResults/spv.debuginfo.continued.glsl.vert.out b/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
index ae7c5fab29..4deb8764cd 100644
--- a/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.continued.glsl.vert.out
@@ -12,14 +12,7 @@ spv.debuginfo.continued.glsl.vert
                2:             String  "spv.debuginfo.continued.glsl.vert"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
@@ -1904,10 +1897,10 @@ spv.debuginfo.continued.glsl.vert
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
-// This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceCont"
-              20:             String  "inued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the maximum length of DebugSource "
+              20:             String  "and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
@@ -3791,8 +3784,10 @@ spv.debuginfo.continued.glsl.vert
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
-// This is filler text to cause the source length to exceed the maximum length of DebugSource and req"
-              22:             String  "uire the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the"
+              22:             String  " maximum length of DebugSource and require the use of DebugSourceContinued.
 
 void main()
 {
@@ -3831,7 +3826,7 @@ void main()
               18:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 35(DebugSource) 2 19
               21:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 102(DebugSourceContinued) 20
               23:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 102(DebugSourceContinued) 22
-              24:      7(int) Constant 3774
+              24:      7(int) Constant 3776
               26:      7(int) Constant 1
               27:      7(int) Constant 4
               28:      7(int) Constant 2
@@ -3852,7 +3847,7 @@ void main()
               46:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 47 38 18 26 48 12 12 13
               51:      7(int) Constant 85
               49:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 11(DebugTypeMember) 50 38 18 26 51 12 12 13
-              54:      7(int) Constant 3776
+              54:      7(int) Constant 3778
               52:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 10(DebugTypeComposite) 53 26 18 54 12 25 53 12 13 40 43 46 49
               55:             TypePointer Output 39(gl_PerVertex)
               56:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 52 13 12
@@ -3866,7 +3861,7 @@ void main()
               66:   35(fvec4) ConstantComposite 65 65 65 65
               67:             TypePointer Output 35(fvec4)
               68:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 3(DebugTypePointer) 36 13 12
-              72:      7(int) Constant 3777
+              72:      7(int) Constant 3779
         14(main):           4 Function None 5
               15:             Label
               30:           4 ExtInst 1(NonSemantic.Shader.DebugInfo.100) 23(DebugScope) 17
diff --git a/Test/baseResults/spv.debuginfo.declaration.glsl.frag.out b/Test/baseResults/spv.debuginfo.declaration.glsl.frag.out
index cf23c561c0..6bc1c0b9ec 100644
--- a/Test/baseResults/spv.debuginfo.declaration.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.declaration.glsl.frag.out
@@ -13,14 +13,7 @@ spv.debuginfo.declaration.glsl.frag
                2:             String  "spv.debuginfo.declaration.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 uniform UBO {
     int x;
diff --git a/Test/baseResults/spv.debuginfo.glsl.comp.out b/Test/baseResults/spv.debuginfo.glsl.comp.out
index adf34c6368..33d2201123 100644
--- a/Test/baseResults/spv.debuginfo.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.glsl.comp.out
@@ -14,14 +14,7 @@ spv.debuginfo.glsl.comp
                8:             String  "uint"
               17:             String  "float"
               33:             String  "springForce"
-              36:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              36:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.glsl.frag.out b/Test/baseResults/spv.debuginfo.glsl.frag.out
index 5eb00d21c2..be26ead441 100644
--- a/Test/baseResults/spv.debuginfo.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.glsl.frag.out
@@ -15,14 +15,7 @@ spv.debuginfo.glsl.frag
                8:             String  "uint"
               17:             String  "float"
               39:             String  "textureProj"
-              42:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              42:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.glsl.geom.out b/Test/baseResults/spv.debuginfo.glsl.geom.out
index 02936226d0..22526cf776 100644
--- a/Test/baseResults/spv.debuginfo.glsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.glsl.geom.out
@@ -17,14 +17,7 @@ spv.debuginfo.glsl.geom
                2:             String  "spv.debuginfo.glsl.geom"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              19:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.glsl.tesc.out b/Test/baseResults/spv.debuginfo.glsl.tesc.out
index 5508a753b8..7014b1e77a 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tesc.out
@@ -14,14 +14,7 @@ spv.debuginfo.glsl.tesc
                8:             String  "uint"
               17:             String  "float"
               31:             String  "screenSpaceTessFactor"
-              34:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              34:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.glsl.tese.out b/Test/baseResults/spv.debuginfo.glsl.tese.out
index 04d688e6d3..681d95204c 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tese.out
@@ -15,14 +15,7 @@ spv.debuginfo.glsl.tese
                2:             String  "spv.debuginfo.glsl.tese"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              19:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.glsl.vert.out b/Test/baseResults/spv.debuginfo.glsl.vert.out
index da470fe3a1..d1f425efff 100644
--- a/Test/baseResults/spv.debuginfo.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.glsl.vert.out
@@ -12,14 +12,7 @@ spv.debuginfo.glsl.vert
                2:             String  "spv.debuginfo.glsl.vert"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              19:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Sascha Willems
diff --git a/Test/baseResults/spv.debuginfo.hlsl.comp.out b/Test/baseResults/spv.debuginfo.hlsl.comp.out
index 6ad6991933..1d01f30e08 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.comp.out
@@ -14,15 +14,7 @@ spv.debuginfo.hlsl.comp
                9:             String  "float"
               12:             String  "uint"
               32:             String  "springForce"
-              35:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              35:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.hlsl.frag.out b/Test/baseResults/spv.debuginfo.hlsl.frag.out
index a7f1a3acd4..9dae1e8898 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.frag.out
@@ -15,15 +15,7 @@ spv.debuginfo.hlsl.frag
                9:             String  "float"
               12:             String  "uint"
               38:             String  "textureProj"
-              41:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              41:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.hlsl.geom.out b/Test/baseResults/spv.debuginfo.hlsl.geom.out
index a0b0e6c5c7..1ff2a9135a 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.geom.out
@@ -18,15 +18,7 @@ spv.debuginfo.hlsl.geom
                9:             String  "float"
               12:             String  "uint"
               25:             String  "Pos"
-              27:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              27:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tesc.out b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
index 285aeb0a61..7ad48950b5 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
@@ -19,15 +19,7 @@ WARNING: spv.debuginfo.hlsl.tesc:158: '' : attribute does not apply to entry poi
                9:             String  "float"
               12:             String  "uint"
               30:             String  "screenSpaceTessFactor"
-              33:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              33:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tese.out b/Test/baseResults/spv.debuginfo.hlsl.tese.out
index ab2bbed8f2..3ebdc90d45 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tese.out
@@ -14,15 +14,7 @@ spv.debuginfo.hlsl.tese
                9:             String  "float"
               12:             String  "uint"
               26:             String  "TessLevelOuter"
-              28:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              28:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.hlsl.vert.out b/Test/baseResults/spv.debuginfo.hlsl.vert.out
index 3ff0ab7560..f554a75a66 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.vert.out
@@ -14,15 +14,7 @@ spv.debuginfo.hlsl.vert
               12:             String  "uint"
               24:             String  "int"
               29:             String  "Pos"
-              31:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed entry-point main
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed hlsl-offsets
-#line 1
-/*
+              31:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2022 Google LLC
diff --git a/Test/baseResults/spv.debuginfo.implicit_br.glsl.frag.out b/Test/baseResults/spv.debuginfo.implicit_br.glsl.frag.out
index a5c0dffc1b..b8fc90db12 100644
--- a/Test/baseResults/spv.debuginfo.implicit_br.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.implicit_br.glsl.frag.out
@@ -13,14 +13,7 @@ spv.debuginfo.implicit_br.glsl.frag
                2:             String  "spv.debuginfo.implicit_br.glsl.frag"
                8:             String  "uint"
               18:             String  "test_if"
-              21:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              21:             String  "#version 460
 
 out int outx;
 int counter = 0;
diff --git a/Test/baseResults/spv.debuginfo.include.glsl.frag.out b/Test/baseResults/spv.debuginfo.include.glsl.frag.out
index 96759e2b73..9e5a8dffbc 100644
--- a/Test/baseResults/spv.debuginfo.include.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.include.glsl.frag.out
@@ -25,14 +25,7 @@ uniform UBO {
 vec4 headerFunction(vec4 a) {
 	return -a;
 }"
-              39:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 450
+              39:             String  "#version 450
 
 #extension GL_GOOGLE_include_directive : require
 #include "spv.debuginfo.include.glsl.h"
diff --git a/Test/baseResults/spv.debuginfo.interface_bool.glsl.comp.out b/Test/baseResults/spv.debuginfo.interface_bool.glsl.comp.out
index 6623a2f92b..61e81d5380 100644
--- a/Test/baseResults/spv.debuginfo.interface_bool.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.interface_bool.glsl.comp.out
@@ -13,14 +13,7 @@ spv.debuginfo.interface_bool.glsl.comp
                2:             String  "spv.debuginfo.interface_bool.glsl.comp"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 450
+              19:             String  "#version 450
 
 layout (local_size_x = 32, local_size_y = 1) in;
 
diff --git a/Test/baseResults/spv.debuginfo.multiline.glsl.frag.out b/Test/baseResults/spv.debuginfo.multiline.glsl.frag.out
index 05dc9245ff..43f47860be 100644
--- a/Test/baseResults/spv.debuginfo.multiline.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.multiline.glsl.frag.out
@@ -14,14 +14,7 @@ spv.debuginfo.multiline.glsl.frag
                8:             String  "uint"
               17:             String  "float"
               29:             String  "add"
-              32:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              32:             String  "#version 460
 
 in float inx;
 out float outx;
diff --git a/Test/baseResults/spv.debuginfo.non_ascii.glsl.frag.out b/Test/baseResults/spv.debuginfo.non_ascii.glsl.frag.out
index a88691696d..a4c7e9c88a 100644
--- a/Test/baseResults/spv.debuginfo.non_ascii.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.non_ascii.glsl.frag.out
@@ -13,14 +13,7 @@ spv.debuginfo.non_ascii.glsl.frag
                2:             String  "spv.debuginfo.non_ascii.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 layout(location = 0) out vec4 o;
 
diff --git a/Test/baseResults/spv.debuginfo.sampler_type.glsl.frag.out b/Test/baseResults/spv.debuginfo.sampler_type.glsl.frag.out
index dcfedabcbd..c22a901ec1 100644
--- a/Test/baseResults/spv.debuginfo.sampler_type.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.sampler_type.glsl.frag.out
@@ -14,14 +14,7 @@ spv.debuginfo.sampler_type.glsl.frag
                2:             String  "spv.debuginfo.sampler_type.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 layout(rgba8, binding = 0) uniform image2D test_image2D;
 
diff --git a/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out b/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
index 063dc7153e..892c3ee902 100644
--- a/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.scalar_types.glsl.frag.out
@@ -18,14 +18,7 @@ spv.debuginfo.scalar_types.glsl.frag
                2:             String  "spv.debuginfo.scalar_types.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-/*
+              19:             String  "/*
 The MIT License (MIT)
 
 Copyright (c) 2023 NVIDIA CORPORATION.
diff --git a/Test/baseResults/spv.debuginfo.ubo.glsl.frag.out b/Test/baseResults/spv.debuginfo.ubo.glsl.frag.out
index dd160ee216..0a87c1fae9 100644
--- a/Test/baseResults/spv.debuginfo.ubo.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.ubo.glsl.frag.out
@@ -13,14 +13,7 @@ spv.debuginfo.ubo.glsl.frag
                2:             String  "spv.debuginfo.ubo.glsl.frag"
                8:             String  "uint"
               16:             String  "main"
-              19:             String  "// OpModuleProcessed auto-map-locations
-// OpModuleProcessed auto-map-bindings
-// OpModuleProcessed client vulkan100
-// OpModuleProcessed target-env vulkan1.0
-// OpModuleProcessed keep-uncalled
-// OpModuleProcessed entry-point main
-#line 1
-#version 460
+              19:             String  "#version 460
 
 uniform UBO1 {
     vec4 memberA;
diff --git a/Test/spv.debuginfo.continued.glsl.vert b/Test/spv.debuginfo.continued.glsl.vert
index 9d93a6716d..a4751dfa93 100644
--- a/Test/spv.debuginfo.continued.glsl.vert
+++ b/Test/spv.debuginfo.continued.glsl.vert
@@ -3770,6 +3770,8 @@
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 // This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
+// This is filler text to cause the source length to exceed the maximum length of DebugSource and require the use of DebugSourceContinued.
 
 void main()
 {