Tests: Move to just linefeed to simply cross-platform test changes.
diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out
index 807b03d..95090b8 100755
--- a/Test/baseResults/spv.texture.vert.out
+++ b/Test/baseResults/spv.texture.vert.out
@@ -1,195 +1,195 @@
-spv.texture.vert
-
-Linked vertex stage:
-
-
-// Module Version 10000
-// Generated by (magic number): 80001
-// Id's are bound by 145
-
- Capability Shader
- 1: ExtInstImport "GLSL.std.450"
- MemoryModel Logical GLSL450
- EntryPoint Vertex 4 "main" 39 144
- Source GLSL 130
- Name 4 "main"
- Name 8 "lod"
- Name 10 "coords1D"
- Name 14 "coords3D"
- Name 20 "coords4D"
- Name 23 "color"
- Name 29 "texSampler1D"
- Name 39 "coords2D"
- Name 54 "texSampler2D"
- Name 76 "texSampler3D"
- Name 92 "texSamplerCube"
- Name 102 "shadowSampler1D"
- Name 114 "shadowSampler2D"
- Name 140 "gl_Position"
- Name 144 "gl_VertexID"
- Decorate 140(gl_Position) BuiltIn Position
- Decorate 144(gl_VertexID) BuiltIn VertexId
- 2: TypeVoid
- 3: TypeFunction 2
- 6: TypeFloat 32
- 7: TypePointer Function 6(float)
- 9: 6(float) Constant 1077936128
- 11: 6(float) Constant 1071971828
- 12: TypeVector 6(float) 3
- 13: TypePointer Function 12(fvec3)
- 15: 6(float) Constant 1076753334
- 16: 6(float) Constant 1079836148
- 17: 12(fvec3) ConstantComposite 11 15 16
- 18: TypeVector 6(float) 4
- 19: TypePointer Function 18(fvec4)
- 21: 6(float) Constant 1073741824
- 22: 18(fvec4) ConstantComposite 11 15 16 21
- 24: 6(float) Constant 0
- 25: 18(fvec4) ConstantComposite 24 24 24 24
- 26: TypeImage 6(float) 1D sampled format:Unknown
- 27: TypeSampledImage 26
- 28: TypePointer UniformConstant 27
-29(texSampler1D): 28(ptr) Variable UniformConstant
- 37: TypeVector 6(float) 2
- 38: TypePointer Input 37(fvec2)
- 39(coords2D): 38(ptr) Variable Input
- 51: TypeImage 6(float) 2D sampled format:Unknown
- 52: TypeSampledImage 51
- 53: TypePointer UniformConstant 52
-54(texSampler2D): 53(ptr) Variable UniformConstant
- 73: TypeImage 6(float) 3D sampled format:Unknown
- 74: TypeSampledImage 73
- 75: TypePointer UniformConstant 74
-76(texSampler3D): 75(ptr) Variable UniformConstant
- 89: TypeImage 6(float) Cube sampled format:Unknown
- 90: TypeSampledImage 89
- 91: TypePointer UniformConstant 90
-92(texSamplerCube): 91(ptr) Variable UniformConstant
- 99: TypeImage 6(float) 1D depth sampled format:Unknown
- 100: TypeSampledImage 99
- 101: TypePointer UniformConstant 100
-102(shadowSampler1D): 101(ptr) Variable UniformConstant
- 111: TypeImage 6(float) 2D depth sampled format:Unknown
- 112: TypeSampledImage 111
- 113: TypePointer UniformConstant 112
-114(shadowSampler2D): 113(ptr) Variable UniformConstant
- 139: TypePointer Output 18(fvec4)
-140(gl_Position): 139(ptr) Variable Output
- 142: TypeInt 32 1
- 143: TypePointer Input 142(int)
-144(gl_VertexID): 143(ptr) Variable Input
- 4(main): 2 Function None 3
- 5: Label
- 8(lod): 7(ptr) Variable Function
- 10(coords1D): 7(ptr) Variable Function
- 14(coords3D): 13(ptr) Variable Function
- 20(coords4D): 19(ptr) Variable Function
- 23(color): 19(ptr) Variable Function
- Store 8(lod) 9
- Store 10(coords1D) 11
- Store 14(coords3D) 17
- Store 20(coords4D) 22
- Store 23(color) 25
- 30: 27 Load 29(texSampler1D)
- 31: 6(float) Load 10(coords1D)
- 32: 6(float) Load 8(lod)
- 33: 18(fvec4) ImageSampleExplicitLod 30 31 Lod 32
- 34: 18(fvec4) Load 23(color)
- 35: 18(fvec4) FAdd 34 33
- Store 23(color) 35
- 36: 27 Load 29(texSampler1D)
- 40: 37(fvec2) Load 39(coords2D)
- 41: 6(float) Load 8(lod)
- 42: 18(fvec4) ImageSampleProjExplicitLod 36 40 Lod 41
- 43: 18(fvec4) Load 23(color)
- 44: 18(fvec4) FAdd 43 42
- Store 23(color) 44
- 45: 27 Load 29(texSampler1D)
- 46: 18(fvec4) Load 20(coords4D)
- 47: 6(float) Load 8(lod)
- 48: 18(fvec4) ImageSampleProjExplicitLod 45 46 Lod 47
- 49: 18(fvec4) Load 23(color)
- 50: 18(fvec4) FAdd 49 48
- Store 23(color) 50
- 55: 52 Load 54(texSampler2D)
- 56: 37(fvec2) Load 39(coords2D)
- 57: 6(float) Load 8(lod)
- 58: 18(fvec4) ImageSampleExplicitLod 55 56 Lod 57
- 59: 18(fvec4) Load 23(color)
- 60: 18(fvec4) FAdd 59 58
- Store 23(color) 60
- 61: 52 Load 54(texSampler2D)
- 62: 12(fvec3) Load 14(coords3D)
- 63: 6(float) Load 8(lod)
- 64: 18(fvec4) ImageSampleProjExplicitLod 61 62 Lod 63
- 65: 18(fvec4) Load 23(color)
- 66: 18(fvec4) FAdd 65 64
- Store 23(color) 66
- 67: 52 Load 54(texSampler2D)
- 68: 18(fvec4) Load 20(coords4D)
- 69: 6(float) Load 8(lod)
- 70: 18(fvec4) ImageSampleProjExplicitLod 67 68 Lod 69
- 71: 18(fvec4) Load 23(color)
- 72: 18(fvec4) FAdd 71 70
- Store 23(color) 72
- 77: 74 Load 76(texSampler3D)
- 78: 12(fvec3) Load 14(coords3D)
- 79: 6(float) Load 8(lod)
- 80: 18(fvec4) ImageSampleExplicitLod 77 78 Lod 79
- 81: 18(fvec4) Load 23(color)
- 82: 18(fvec4) FAdd 81 80
- Store 23(color) 82
- 83: 74 Load 76(texSampler3D)
- 84: 18(fvec4) Load 20(coords4D)
- 85: 6(float) Load 8(lod)
- 86: 18(fvec4) ImageSampleProjExplicitLod 83 84 Lod 85
- 87: 18(fvec4) Load 23(color)
- 88: 18(fvec4) FAdd 87 86
- Store 23(color) 88
- 93: 90 Load 92(texSamplerCube)
- 94: 12(fvec3) Load 14(coords3D)
- 95: 6(float) Load 8(lod)
- 96: 18(fvec4) ImageSampleExplicitLod 93 94 Lod 95
- 97: 18(fvec4) Load 23(color)
- 98: 18(fvec4) FAdd 97 96
- Store 23(color) 98
- 103: 100 Load 102(shadowSampler1D)
- 104: 12(fvec3) Load 14(coords3D)
- 105: 6(float) Load 8(lod)
- 106: 6(float) CompositeExtract 104 2
- 107: 6(float) ImageSampleDrefExplicitLod 103 104 106 Lod 105
- 108: 18(fvec4) Load 23(color)
- 109: 18(fvec4) CompositeConstruct 107 107 107 107
- 110: 18(fvec4) FAdd 108 109
- Store 23(color) 110
- 115: 112 Load 114(shadowSampler2D)
- 116: 12(fvec3) Load 14(coords3D)
- 117: 6(float) Load 8(lod)
- 118: 6(float) CompositeExtract 116 2
- 119: 6(float) ImageSampleDrefExplicitLod 115 116 118 Lod 117
- 120: 18(fvec4) Load 23(color)
- 121: 18(fvec4) CompositeConstruct 119 119 119 119
- 122: 18(fvec4) FAdd 120 121
- Store 23(color) 122
- 123: 100 Load 102(shadowSampler1D)
- 124: 18(fvec4) Load 20(coords4D)
- 125: 6(float) Load 8(lod)
- 126: 6(float) CompositeExtract 124 3
- 127: 6(float) ImageSampleProjDrefExplicitLod 123 124 126 Lod 125
- 128: 18(fvec4) Load 23(color)
- 129: 18(fvec4) CompositeConstruct 127 127 127 127
- 130: 18(fvec4) FAdd 128 129
- Store 23(color) 130
- 131: 112 Load 114(shadowSampler2D)
- 132: 18(fvec4) Load 20(coords4D)
- 133: 6(float) Load 8(lod)
- 134: 6(float) CompositeExtract 132 3
- 135: 6(float) ImageSampleProjDrefExplicitLod 131 132 134 Lod 133
- 136: 18(fvec4) Load 23(color)
- 137: 18(fvec4) CompositeConstruct 135 135 135 135
- 138: 18(fvec4) FAdd 136 137
- Store 23(color) 138
- 141: 18(fvec4) Load 23(color)
- Store 140(gl_Position) 141
- Return
- FunctionEnd
+spv.texture.vert
+
+Linked vertex stage:
+
+
+// Module Version 10000
+// Generated by (magic number): 80001
+// Id's are bound by 145
+
+ Capability Shader
+ 1: ExtInstImport "GLSL.std.450"
+ MemoryModel Logical GLSL450
+ EntryPoint Vertex 4 "main" 39 144
+ Source GLSL 130
+ Name 4 "main"
+ Name 8 "lod"
+ Name 10 "coords1D"
+ Name 14 "coords3D"
+ Name 20 "coords4D"
+ Name 23 "color"
+ Name 29 "texSampler1D"
+ Name 39 "coords2D"
+ Name 54 "texSampler2D"
+ Name 76 "texSampler3D"
+ Name 92 "texSamplerCube"
+ Name 102 "shadowSampler1D"
+ Name 114 "shadowSampler2D"
+ Name 140 "gl_Position"
+ Name 144 "gl_VertexID"
+ Decorate 140(gl_Position) BuiltIn Position
+ Decorate 144(gl_VertexID) BuiltIn VertexId
+ 2: TypeVoid
+ 3: TypeFunction 2
+ 6: TypeFloat 32
+ 7: TypePointer Function 6(float)
+ 9: 6(float) Constant 1077936128
+ 11: 6(float) Constant 1071971828
+ 12: TypeVector 6(float) 3
+ 13: TypePointer Function 12(fvec3)
+ 15: 6(float) Constant 1076753334
+ 16: 6(float) Constant 1079836148
+ 17: 12(fvec3) ConstantComposite 11 15 16
+ 18: TypeVector 6(float) 4
+ 19: TypePointer Function 18(fvec4)
+ 21: 6(float) Constant 1073741824
+ 22: 18(fvec4) ConstantComposite 11 15 16 21
+ 24: 6(float) Constant 0
+ 25: 18(fvec4) ConstantComposite 24 24 24 24
+ 26: TypeImage 6(float) 1D sampled format:Unknown
+ 27: TypeSampledImage 26
+ 28: TypePointer UniformConstant 27
+29(texSampler1D): 28(ptr) Variable UniformConstant
+ 37: TypeVector 6(float) 2
+ 38: TypePointer Input 37(fvec2)
+ 39(coords2D): 38(ptr) Variable Input
+ 51: TypeImage 6(float) 2D sampled format:Unknown
+ 52: TypeSampledImage 51
+ 53: TypePointer UniformConstant 52
+54(texSampler2D): 53(ptr) Variable UniformConstant
+ 73: TypeImage 6(float) 3D sampled format:Unknown
+ 74: TypeSampledImage 73
+ 75: TypePointer UniformConstant 74
+76(texSampler3D): 75(ptr) Variable UniformConstant
+ 89: TypeImage 6(float) Cube sampled format:Unknown
+ 90: TypeSampledImage 89
+ 91: TypePointer UniformConstant 90
+92(texSamplerCube): 91(ptr) Variable UniformConstant
+ 99: TypeImage 6(float) 1D depth sampled format:Unknown
+ 100: TypeSampledImage 99
+ 101: TypePointer UniformConstant 100
+102(shadowSampler1D): 101(ptr) Variable UniformConstant
+ 111: TypeImage 6(float) 2D depth sampled format:Unknown
+ 112: TypeSampledImage 111
+ 113: TypePointer UniformConstant 112
+114(shadowSampler2D): 113(ptr) Variable UniformConstant
+ 139: TypePointer Output 18(fvec4)
+140(gl_Position): 139(ptr) Variable Output
+ 142: TypeInt 32 1
+ 143: TypePointer Input 142(int)
+144(gl_VertexID): 143(ptr) Variable Input
+ 4(main): 2 Function None 3
+ 5: Label
+ 8(lod): 7(ptr) Variable Function
+ 10(coords1D): 7(ptr) Variable Function
+ 14(coords3D): 13(ptr) Variable Function
+ 20(coords4D): 19(ptr) Variable Function
+ 23(color): 19(ptr) Variable Function
+ Store 8(lod) 9
+ Store 10(coords1D) 11
+ Store 14(coords3D) 17
+ Store 20(coords4D) 22
+ Store 23(color) 25
+ 30: 27 Load 29(texSampler1D)
+ 31: 6(float) Load 10(coords1D)
+ 32: 6(float) Load 8(lod)
+ 33: 18(fvec4) ImageSampleExplicitLod 30 31 Lod 32
+ 34: 18(fvec4) Load 23(color)
+ 35: 18(fvec4) FAdd 34 33
+ Store 23(color) 35
+ 36: 27 Load 29(texSampler1D)
+ 40: 37(fvec2) Load 39(coords2D)
+ 41: 6(float) Load 8(lod)
+ 42: 18(fvec4) ImageSampleProjExplicitLod 36 40 Lod 41
+ 43: 18(fvec4) Load 23(color)
+ 44: 18(fvec4) FAdd 43 42
+ Store 23(color) 44
+ 45: 27 Load 29(texSampler1D)
+ 46: 18(fvec4) Load 20(coords4D)
+ 47: 6(float) Load 8(lod)
+ 48: 18(fvec4) ImageSampleProjExplicitLod 45 46 Lod 47
+ 49: 18(fvec4) Load 23(color)
+ 50: 18(fvec4) FAdd 49 48
+ Store 23(color) 50
+ 55: 52 Load 54(texSampler2D)
+ 56: 37(fvec2) Load 39(coords2D)
+ 57: 6(float) Load 8(lod)
+ 58: 18(fvec4) ImageSampleExplicitLod 55 56 Lod 57
+ 59: 18(fvec4) Load 23(color)
+ 60: 18(fvec4) FAdd 59 58
+ Store 23(color) 60
+ 61: 52 Load 54(texSampler2D)
+ 62: 12(fvec3) Load 14(coords3D)
+ 63: 6(float) Load 8(lod)
+ 64: 18(fvec4) ImageSampleProjExplicitLod 61 62 Lod 63
+ 65: 18(fvec4) Load 23(color)
+ 66: 18(fvec4) FAdd 65 64
+ Store 23(color) 66
+ 67: 52 Load 54(texSampler2D)
+ 68: 18(fvec4) Load 20(coords4D)
+ 69: 6(float) Load 8(lod)
+ 70: 18(fvec4) ImageSampleProjExplicitLod 67 68 Lod 69
+ 71: 18(fvec4) Load 23(color)
+ 72: 18(fvec4) FAdd 71 70
+ Store 23(color) 72
+ 77: 74 Load 76(texSampler3D)
+ 78: 12(fvec3) Load 14(coords3D)
+ 79: 6(float) Load 8(lod)
+ 80: 18(fvec4) ImageSampleExplicitLod 77 78 Lod 79
+ 81: 18(fvec4) Load 23(color)
+ 82: 18(fvec4) FAdd 81 80
+ Store 23(color) 82
+ 83: 74 Load 76(texSampler3D)
+ 84: 18(fvec4) Load 20(coords4D)
+ 85: 6(float) Load 8(lod)
+ 86: 18(fvec4) ImageSampleProjExplicitLod 83 84 Lod 85
+ 87: 18(fvec4) Load 23(color)
+ 88: 18(fvec4) FAdd 87 86
+ Store 23(color) 88
+ 93: 90 Load 92(texSamplerCube)
+ 94: 12(fvec3) Load 14(coords3D)
+ 95: 6(float) Load 8(lod)
+ 96: 18(fvec4) ImageSampleExplicitLod 93 94 Lod 95
+ 97: 18(fvec4) Load 23(color)
+ 98: 18(fvec4) FAdd 97 96
+ Store 23(color) 98
+ 103: 100 Load 102(shadowSampler1D)
+ 104: 12(fvec3) Load 14(coords3D)
+ 105: 6(float) Load 8(lod)
+ 106: 6(float) CompositeExtract 104 2
+ 107: 6(float) ImageSampleDrefExplicitLod 103 104 106 Lod 105
+ 108: 18(fvec4) Load 23(color)
+ 109: 18(fvec4) CompositeConstruct 107 107 107 107
+ 110: 18(fvec4) FAdd 108 109
+ Store 23(color) 110
+ 115: 112 Load 114(shadowSampler2D)
+ 116: 12(fvec3) Load 14(coords3D)
+ 117: 6(float) Load 8(lod)
+ 118: 6(float) CompositeExtract 116 2
+ 119: 6(float) ImageSampleDrefExplicitLod 115 116 118 Lod 117
+ 120: 18(fvec4) Load 23(color)
+ 121: 18(fvec4) CompositeConstruct 119 119 119 119
+ 122: 18(fvec4) FAdd 120 121
+ Store 23(color) 122
+ 123: 100 Load 102(shadowSampler1D)
+ 124: 18(fvec4) Load 20(coords4D)
+ 125: 6(float) Load 8(lod)
+ 126: 6(float) CompositeExtract 124 3
+ 127: 6(float) ImageSampleProjDrefExplicitLod 123 124 126 Lod 125
+ 128: 18(fvec4) Load 23(color)
+ 129: 18(fvec4) CompositeConstruct 127 127 127 127
+ 130: 18(fvec4) FAdd 128 129
+ Store 23(color) 130
+ 131: 112 Load 114(shadowSampler2D)
+ 132: 18(fvec4) Load 20(coords4D)
+ 133: 6(float) Load 8(lod)
+ 134: 6(float) CompositeExtract 132 3
+ 135: 6(float) ImageSampleProjDrefExplicitLod 131 132 134 Lod 133
+ 136: 18(fvec4) Load 23(color)
+ 137: 18(fvec4) CompositeConstruct 135 135 135 135
+ 138: 18(fvec4) FAdd 136 137
+ Store 23(color) 138
+ 141: 18(fvec4) Load 23(color)
+ Store 140(gl_Position) 141
+ Return
+ FunctionEnd