From: John Kessenich Date: Fri, 7 Apr 2017 21:33:08 +0000 (-0600) Subject: HLSL: Emit the OpSource HLSL instruction for HLSL, using new headers. X-Git-Tag: upstream/11.4.0~1210 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6fa17641b5b5181856a47fa42659bdc7f64edc3d;p=platform%2Fupstream%2Fglslang.git HLSL: Emit the OpSource HLSL instruction for HLSL, using new headers. --- diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index aae3f49..ebb7230 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -222,8 +222,7 @@ spv::SourceLanguage TranslateSourceLanguage(glslang::EShSource source, EProfile return spv::SourceLanguageUnknown; } case glslang::EShSourceHlsl: - // Use SourceLanguageUnknown instead of SourceLanguageHLSL for now, until Vulkan knows what HLSL is - return spv::SourceLanguageUnknown; + return spv::SourceLanguageHLSL; default: return spv::SourceLanguageUnknown; } diff --git a/Test/baseResults/hlsl.amend.frag.out b/Test/baseResults/hlsl.amend.frag.out index a93643e..388d346 100755 --- a/Test/baseResults/hlsl.amend.frag.out +++ b/Test/baseResults/hlsl.amend.frag.out @@ -1,5 +1,5 @@ hlsl.amend.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence @@ -81,7 +81,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence @@ -168,6 +168,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "f1" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "f1" Name 6 "@f1(" Name 8 "f2(" diff --git a/Test/baseResults/hlsl.array.flatten.frag.out b/Test/baseResults/hlsl.array.flatten.frag.out index 1beb71f..7385cea 100644 --- a/Test/baseResults/hlsl.array.flatten.frag.out +++ b/Test/baseResults/hlsl.array.flatten.frag.out @@ -1,5 +1,5 @@ hlsl.array.flatten.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:17 Function Definition: TestFn1( ( temp 4-component vector of float) @@ -173,7 +173,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:17 Function Definition: TestFn1( ( temp 4-component vector of float) @@ -353,6 +353,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 128 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "TestFn1(" Name 22 "TestFn2(t11[3];p1[3];" diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out index 58fa077..c0c5a13 100755 --- a/Test/baseResults/hlsl.array.frag.out +++ b/Test/baseResults/hlsl.array.frag.out @@ -1,5 +1,5 @@ hlsl.array.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: @PixelShaderFunction(i1;vf4[3]; ( temp 4-component vector of float) @@ -76,7 +76,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: @PixelShaderFunction(i1;vf4[3]; ( temp 4-component vector of float) @@ -158,6 +158,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 68 72 75 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 17 "@PixelShaderFunction(i1;vf4[3];" Name 15 "i" diff --git a/Test/baseResults/hlsl.array.implicit-size.frag.out b/Test/baseResults/hlsl.array.implicit-size.frag.out index efe1240..e4854db 100644 --- a/Test/baseResults/hlsl.array.implicit-size.frag.out +++ b/Test/baseResults/hlsl.array.implicit-size.frag.out @@ -1,5 +1,5 @@ hlsl.array.implicit-size.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence @@ -83,7 +83,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence @@ -171,6 +171,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.array.multidim.frag.out b/Test/baseResults/hlsl.array.multidim.frag.out index e13399e..72fa2ec 100644 --- a/Test/baseResults/hlsl.array.multidim.frag.out +++ b/Test/baseResults/hlsl.array.multidim.frag.out @@ -1,5 +1,5 @@ hlsl.array.multidim.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -142,6 +142,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 54 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.assoc.frag.out b/Test/baseResults/hlsl.assoc.frag.out index 0a48528..dcefa9c 100755 --- a/Test/baseResults/hlsl.assoc.frag.out +++ b/Test/baseResults/hlsl.assoc.frag.out @@ -1,5 +1,5 @@ hlsl.assoc.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; ( temp 4-component vector of float) @@ -67,7 +67,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4;vf4; ( temp 4-component vector of float) @@ -140,6 +140,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 31 34 37 40 43 46 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 15 "@PixelShaderFunction(vf4;vf4;vf4;vf4;vf4;" Name 10 "a1" diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out index bd4e96b..ed50b9c 100644 --- a/Test/baseResults/hlsl.attribute.expression.comp.out +++ b/Test/baseResults/hlsl.attribute.expression.comp.out @@ -1,5 +1,5 @@ hlsl.attribute.expression.comp -Shader version: 450 +Shader version: 500 local_size = (4, 6, 8) 0:? Sequence 0:9 Function Definition: @main( ( temp 4-component vector of float) @@ -42,7 +42,7 @@ local_size = (4, 6, 8) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (4, 6, 8) 0:? Sequence 0:9 Function Definition: @main( ( temp 4-component vector of float) @@ -90,6 +90,7 @@ local_size = (4, 6, 8) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "main" 37 ExecutionMode 4 LocalSize 4 6 8 + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 13 "x" diff --git a/Test/baseResults/hlsl.attribute.frag.out b/Test/baseResults/hlsl.attribute.frag.out index abda4da..ccd7693 100755 --- a/Test/baseResults/hlsl.attribute.frag.out +++ b/Test/baseResults/hlsl.attribute.frag.out @@ -1,5 +1,5 @@ hlsl.attribute.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp void) @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp void) @@ -58,6 +58,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 19 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.basic.comp.out b/Test/baseResults/hlsl.basic.comp.out index 172dfef..9842506 100755 --- a/Test/baseResults/hlsl.basic.comp.out +++ b/Test/baseResults/hlsl.basic.comp.out @@ -1,5 +1,5 @@ hlsl.basic.comp -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:4 Function Definition: @main(i1;i1; ( temp void) @@ -31,7 +31,7 @@ local_size = (1, 1, 1) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:4 Function Definition: @main(i1;i1; ( temp void) @@ -68,6 +68,7 @@ local_size = (1, 1, 1) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "main" 18 21 ExecutionMode 4 LocalSize 1 1 1 + Source HLSL 500 Name 4 "main" Name 11 "@main(i1;i1;" Name 9 "dti" diff --git a/Test/baseResults/hlsl.basic.geom.out b/Test/baseResults/hlsl.basic.geom.out index 4d68b44..64239c5 100644 --- a/Test/baseResults/hlsl.basic.geom.out +++ b/Test/baseResults/hlsl.basic.geom.out @@ -1,5 +1,5 @@ hlsl.basic.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 4 input primitive = triangles @@ -74,7 +74,7 @@ output primitive = line_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 4 input primitive = triangles @@ -157,6 +157,7 @@ output primitive = line_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputLineStrip ExecutionMode 4 OutputVertices 4 + Source HLSL 500 Name 4 "main" Name 12 "PSInput" MemberName 12(PSInput) 0 "myfloat" diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out index c406f24..623480c 100755 --- a/Test/baseResults/hlsl.buffer.frag.out +++ b/Test/baseResults/hlsl.buffer.frag.out @@ -1,5 +1,5 @@ hlsl.buffer.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:30 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:30 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -106,6 +106,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 46 49 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index f018984..535905c 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.calculatelod.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -367,6 +367,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 140 144 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index 4e2e886..f19f5d0 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -11,7 +11,7 @@ ERROR: 0:38: '' : unimplemented: CalculateLevelOfDetailUnclamped ERROR: 9 compilation errors. No code generated. -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -191,7 +191,7 @@ ERROR: node is still EOpNull! Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) diff --git a/Test/baseResults/hlsl.cast.frag.out b/Test/baseResults/hlsl.cast.frag.out index d17251d..854c94e 100755 --- a/Test/baseResults/hlsl.cast.frag.out +++ b/Test/baseResults/hlsl.cast.frag.out @@ -1,5 +1,5 @@ hlsl.cast.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -80,6 +80,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 32 35 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.clip.frag.out b/Test/baseResults/hlsl.clip.frag.out index 049bd8a..9b2de87 100644 --- a/Test/baseResults/hlsl.clip.frag.out +++ b/Test/baseResults/hlsl.clip.frag.out @@ -1,5 +1,5 @@ hlsl.clip.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: GetEntitySelectClip( ( temp float) @@ -38,7 +38,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: GetEntitySelectClip( ( temp float) @@ -82,6 +82,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 28 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "GetEntitySelectClip(" Name 12 "@main(" diff --git a/Test/baseResults/hlsl.comparison.vec.frag.out b/Test/baseResults/hlsl.comparison.vec.frag.out index dacdb77..dd363c6 100644 --- a/Test/baseResults/hlsl.comparison.vec.frag.out +++ b/Test/baseResults/hlsl.comparison.vec.frag.out @@ -1,5 +1,5 @@ hlsl.comparison.vec.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: Bug1(vf4; ( temp void) @@ -132,7 +132,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: Bug1(vf4; ( temp void) @@ -270,6 +270,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 90 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Bug1(vf4;" Name 10 "a" diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out index c535138..4028cad 100755 --- a/Test/baseResults/hlsl.conditional.frag.out +++ b/Test/baseResults/hlsl.conditional.frag.out @@ -1,5 +1,5 @@ hlsl.conditional.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -125,7 +125,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -256,6 +256,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 95 98 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index eed1694..90c667a 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -1,5 +1,5 @@ hlsl.constructexpr.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -112,6 +112,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 37 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out b/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out index 24e6982..3d493f7 100644 --- a/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out +++ b/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out @@ -7,6 +7,7 @@ hlsl.deadFunctionMissingBody.vert 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 16 + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 16 "@entryPointOutput" diff --git a/Test/baseResults/hlsl.depthGreater.frag.out b/Test/baseResults/hlsl.depthGreater.frag.out index 8ff7e73..f1bbb5b 100755 --- a/Test/baseResults/hlsl.depthGreater.frag.out +++ b/Test/baseResults/hlsl.depthGreater.frag.out @@ -1,5 +1,5 @@ hlsl.depthGreater.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_greater 0:? Sequence @@ -26,7 +26,7 @@ using depth_greater Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_greater 0:? Sequence @@ -59,6 +59,7 @@ using depth_greater EntryPoint Fragment 4 "PixelShaderFunction" 18 ExecutionMode 4 OriginUpperLeft ExecutionMode 4 DepthGreater + Source HLSL 500 Name 4 "PixelShaderFunction" Name 10 "@PixelShaderFunction(f1;" Name 9 "depth" diff --git a/Test/baseResults/hlsl.depthLess.frag.out b/Test/baseResults/hlsl.depthLess.frag.out index ef81b4a..7a3e926 100755 --- a/Test/baseResults/hlsl.depthLess.frag.out +++ b/Test/baseResults/hlsl.depthLess.frag.out @@ -1,5 +1,5 @@ hlsl.depthLess.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_less 0:? Sequence @@ -22,7 +22,7 @@ using depth_less Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_less 0:? Sequence @@ -51,6 +51,7 @@ using depth_less EntryPoint Fragment 4 "PixelShaderFunction" 14 ExecutionMode 4 OriginUpperLeft ExecutionMode 4 DepthLess + Source HLSL 500 Name 4 "PixelShaderFunction" Name 8 "@PixelShaderFunction(" Name 14 "@entryPointOutput" diff --git a/Test/baseResults/hlsl.discard.frag.out b/Test/baseResults/hlsl.discard.frag.out index 11f8640..508ac5a 100755 --- a/Test/baseResults/hlsl.discard.frag.out +++ b/Test/baseResults/hlsl.discard.frag.out @@ -1,5 +1,5 @@ hlsl.discard.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo(f1; ( temp void) @@ -55,7 +55,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo(f1; ( temp void) @@ -116,6 +116,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 45 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 10 "foo(f1;" Name 9 "f" diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out index 35cf748..b427965 100755 --- a/Test/baseResults/hlsl.doLoop.frag.out +++ b/Test/baseResults/hlsl.doLoop.frag.out @@ -1,5 +1,5 @@ hlsl.doLoop.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -43,7 +43,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -92,6 +92,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 37 40 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.domain.1.tese.out b/Test/baseResults/hlsl.domain.1.tese.out index 550ead0..e1a414d 100644 --- a/Test/baseResults/hlsl.domain.1.tese.out +++ b/Test/baseResults/hlsl.domain.1.tese.out @@ -1,5 +1,5 @@ hlsl.domain.1.tese -Shader version: 450 +Shader version: 500 input primitive = triangles vertex spacing = none triangle order = none @@ -123,7 +123,7 @@ triangle order = none Linked tessellation evaluation stage: -Shader version: 450 +Shader version: 500 input primitive = triangles vertex spacing = none triangle order = none @@ -252,6 +252,7 @@ triangle order = none MemoryModel Logical GLSL450 EntryPoint TessellationEvaluation 4 "main" 51 55 61 76 81 90 ExecutionMode 4 Triangles + Source HLSL 500 Name 4 "main" Name 9 "ds_in_t" MemberName 9(ds_in_t) 0 "pos" diff --git a/Test/baseResults/hlsl.domain.2.tese.out b/Test/baseResults/hlsl.domain.2.tese.out index a80c47e..2336dfa 100644 --- a/Test/baseResults/hlsl.domain.2.tese.out +++ b/Test/baseResults/hlsl.domain.2.tese.out @@ -1,5 +1,5 @@ hlsl.domain.2.tese -Shader version: 450 +Shader version: 500 input primitive = triangles vertex spacing = none triangle order = none @@ -132,7 +132,7 @@ triangle order = none Linked tessellation evaluation stage: -Shader version: 450 +Shader version: 500 input primitive = triangles vertex spacing = none triangle order = none @@ -270,6 +270,7 @@ triangle order = none MemoryModel Logical GLSL450 EntryPoint TessellationEvaluation 4 "main" 52 67 73 80 84 87 ExecutionMode 4 Triangles + Source HLSL 500 Name 4 "main" Name 10 "pcf_in_t" MemberName 10(pcf_in_t) 0 "flTessFactor" diff --git a/Test/baseResults/hlsl.domain.3.tese.out b/Test/baseResults/hlsl.domain.3.tese.out index 1c7b713..d473b96 100644 --- a/Test/baseResults/hlsl.domain.3.tese.out +++ b/Test/baseResults/hlsl.domain.3.tese.out @@ -1,5 +1,5 @@ hlsl.domain.3.tese -Shader version: 450 +Shader version: 500 input primitive = isolines vertex spacing = none triangle order = none @@ -120,7 +120,7 @@ triangle order = none Linked tessellation evaluation stage: -Shader version: 450 +Shader version: 500 input primitive = isolines vertex spacing = none triangle order = none @@ -246,6 +246,7 @@ triangle order = none MemoryModel Logical GLSL450 EntryPoint TessellationEvaluation 4 "main" 54 58 67 81 86 95 ExecutionMode 4 Isolines + Source HLSL 500 Name 4 "main" Name 9 "ds_in_t" MemberName 9(ds_in_t) 0 "pos" diff --git a/Test/baseResults/hlsl.emptystructreturn.frag.out b/Test/baseResults/hlsl.emptystructreturn.frag.out index e0da985..7d11393 100644 --- a/Test/baseResults/hlsl.emptystructreturn.frag.out +++ b/Test/baseResults/hlsl.emptystructreturn.frag.out @@ -1,5 +1,5 @@ hlsl.emptystructreturn.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main(struct-ps_in1; ( temp structure{}) @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main(struct-ps_in1; ( temp structure{}) @@ -58,6 +58,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 20 23 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "ps_in" Name 8 "ps_out" diff --git a/Test/baseResults/hlsl.emptystructreturn.vert.out b/Test/baseResults/hlsl.emptystructreturn.vert.out index ff89352..64446bd 100644 --- a/Test/baseResults/hlsl.emptystructreturn.vert.out +++ b/Test/baseResults/hlsl.emptystructreturn.vert.out @@ -1,5 +1,5 @@ hlsl.emptystructreturn.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:10 Function Definition: @main(struct-vs_in1; ( temp structure{}) 0:10 Function Parameters: @@ -25,7 +25,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:10 Function Definition: @main(struct-vs_in1; ( temp structure{}) 0:10 Function Parameters: @@ -55,6 +55,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 20 23 + Source HLSL 500 Name 4 "main" Name 6 "vs_in" Name 8 "vs_out" diff --git a/Test/baseResults/hlsl.entry-in.frag.out b/Test/baseResults/hlsl.entry-in.frag.out index 7c15616..81441cb 100755 --- a/Test/baseResults/hlsl.entry-in.frag.out +++ b/Test/baseResults/hlsl.entry-in.frag.out @@ -1,5 +1,5 @@ hlsl.entry-in.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: fun(struct-InParam-vf2-vf4-vi21; ( temp float) @@ -89,7 +89,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: fun(struct-InParam-vf2-vf4-vi21; ( temp float) @@ -184,6 +184,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 56 63 73 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "InParam" MemberName 11(InParam) 0 "v" diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index f92605f..1324112 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -1,5 +1,5 @@ hlsl.entry-out.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: fun(struct-OutParam-vf2-vi21; ( temp void) @@ -123,7 +123,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: fun(struct-OutParam-vf2-vi21; ( temp void) @@ -252,6 +252,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 57 60 73 76 80 83 86 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 10 "OutParam" MemberName 10(OutParam) 0 "v" diff --git a/Test/baseResults/hlsl.entry.rename.frag.out b/Test/baseResults/hlsl.entry.rename.frag.out index 293592f..c6a4335 100644 --- a/Test/baseResults/hlsl.entry.rename.frag.out +++ b/Test/baseResults/hlsl.entry.rename.frag.out @@ -1,5 +1,5 @@ hlsl.entry.rename.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: not_the_entry_point( ( temp void) @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: not_the_entry_point( ( temp void) @@ -80,6 +80,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main_in_spv" 26 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main_in_spv" Name 6 "not_the_entry_point(" Name 10 "PS_OUTPUT" diff --git a/Test/baseResults/hlsl.flatten.return.frag.out b/Test/baseResults/hlsl.flatten.return.frag.out index 9b28695..ee2c3f0 100644 --- a/Test/baseResults/hlsl.flatten.return.frag.out +++ b/Test/baseResults/hlsl.flatten.return.frag.out @@ -1,5 +1,5 @@ hlsl.flatten.return.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:11 Function Definition: Func1( ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:11 Function Definition: Func1( ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 29 36 41 45 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.float1.frag.out b/Test/baseResults/hlsl.float1.frag.out index ad29daa..21b1c19 100755 --- a/Test/baseResults/hlsl.float1.frag.out +++ b/Test/baseResults/hlsl.float1.frag.out @@ -1,5 +1,5 @@ hlsl.float1.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -34,7 +34,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -73,6 +73,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "ShaderFunction(vf1;f1;" Name 9 "inFloat1" diff --git a/Test/baseResults/hlsl.float4.frag.out b/Test/baseResults/hlsl.float4.frag.out index d14de7b..4da2a16 100755 --- a/Test/baseResults/hlsl.float4.frag.out +++ b/Test/baseResults/hlsl.float4.frag.out @@ -2,7 +2,7 @@ hlsl.float4.frag WARNING: 0:5: 'register' : ignoring shader_profile WARNING: 0:6: 'register' : ignoring shader_profile -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: ShaderFunction(vf4; ( temp 4-component vector of float) @@ -24,7 +24,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: ShaderFunction(vf4; ( temp 4-component vector of float) @@ -50,6 +50,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "ShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out index a14b9ac..de1f1c0 100755 --- a/Test/baseResults/hlsl.forLoop.frag.out +++ b/Test/baseResults/hlsl.forLoop.frag.out @@ -1,5 +1,5 @@ hlsl.forLoop.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -128,7 +128,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -262,6 +262,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 117 120 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index 69f8e3d..5f9a1ca 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gather.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -131,7 +131,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -270,6 +270,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 107 111 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index 6d2526d..c011f56 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gather.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:29 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -129,7 +129,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:29 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -265,6 +265,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 108 112 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 9eec1ca..46fb13c 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -1,5 +1,5 @@ hlsl.gather.basic.dx10.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:28 Function Parameters: @@ -111,7 +111,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:28 Function Parameters: @@ -228,6 +228,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 103 128 + Source HLSL 500 Name 4 "main" Name 8 "VS_OUTPUT" MemberName 8(VS_OUTPUT) 0 "Pos" diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index c921313..8ed1c07 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gather.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -104,7 +104,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -215,6 +215,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 79 83 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 6b1cac3..73ecae0 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gather.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -101,7 +101,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -209,6 +209,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 80 84 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index c918d99..675e178 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gatherRGBA.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -375,7 +375,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -758,6 +758,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 238 242 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 7bd005a..4d5da52 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gatherRGBA.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:34 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -379,7 +379,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:34 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -765,6 +765,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 238 242 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index 1d3fe46..a4fd588 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gatherRGBA.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:39 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -631,7 +631,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:39 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -1270,6 +1270,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 363 367 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 86e0a99..23d26cc 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gatherRGBA.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:33 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -627,7 +627,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:33 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -1263,6 +1263,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 363 367 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out index 1c7487d..52fcdb2 100644 --- a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.gathercmpRGBA.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -180,7 +180,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -367,6 +367,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 111 115 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index 30483db..c3986d7 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.getdimensions.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:46 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -1159,7 +1159,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:46 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -2328,6 +2328,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 540 544 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index 2faa744..cb1eae6 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -1,5 +1,5 @@ hlsl.getdimensions.dx10.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:11 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:11 Function Parameters: @@ -59,7 +59,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:11 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:11 Function Parameters: @@ -125,6 +125,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 42 50 + Source HLSL 500 Name 4 "main" Name 8 "VS_OUTPUT" MemberName 8(VS_OUTPUT) 0 "Pos" diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out index 781ed90..67b2f8f 100644 --- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.getdimensions.rw.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:44 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -359,7 +359,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:44 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -727,6 +727,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 216 220 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index 57097a4..4c86b75 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -4,7 +4,7 @@ ERROR: 0:17: '' : unimplemented: GetSamplePosition ERROR: 2 compilation errors. No code generated. -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:13 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -75,7 +75,7 @@ ERROR: node is still EOpNull! Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:13 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) diff --git a/Test/baseResults/hlsl.hlslOffset.vert.out b/Test/baseResults/hlsl.hlslOffset.vert.out index 380a086..dcd8027 100644 --- a/Test/baseResults/hlsl.hlslOffset.vert.out +++ b/Test/baseResults/hlsl.hlslOffset.vert.out @@ -1,5 +1,5 @@ hlsl.hlslOffset.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:20 Function Definition: @main( ( temp void) 0:20 Function Parameters: @@ -14,7 +14,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:20 Function Definition: @main( ( temp void) 0:20 Function Parameters: @@ -33,6 +33,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" + Source HLSL 500 Name 4 "main" Name 6 "@main(" Name 15 "b" diff --git a/Test/baseResults/hlsl.hull.1.tesc.out b/Test/baseResults/hlsl.hull.1.tesc.out index a60c122..3e1ad58 100644 --- a/Test/baseResults/hlsl.hull.1.tesc.out +++ b/Test/baseResults/hlsl.hull.1.tesc.out @@ -1,5 +1,5 @@ hlsl.hull.1.tesc -Shader version: 450 +Shader version: 500 vertices = 4 vertex spacing = equal_spacing 0:? Sequence @@ -114,7 +114,7 @@ vertex spacing = equal_spacing Linked tessellation control stage: -Shader version: 450 +Shader version: 500 vertices = 4 vertex spacing = equal_spacing 0:? Sequence @@ -236,6 +236,7 @@ vertex spacing = equal_spacing ExecutionMode 4 OutputVertices 4 ExecutionMode 4 Isolines ExecutionMode 4 SpacingEqual + Source HLSL 500 Name 4 "main" Name 8 "VS_OUT" MemberName 8(VS_OUT) 0 "cpoint" diff --git a/Test/baseResults/hlsl.hull.2.tesc.out b/Test/baseResults/hlsl.hull.2.tesc.out index f7c7389..d32da52 100644 --- a/Test/baseResults/hlsl.hull.2.tesc.out +++ b/Test/baseResults/hlsl.hull.2.tesc.out @@ -1,5 +1,5 @@ hlsl.hull.2.tesc -Shader version: 450 +Shader version: 500 vertices = 4 vertex spacing = equal_spacing 0:? Sequence @@ -112,7 +112,7 @@ vertex spacing = equal_spacing Linked tessellation control stage: -Shader version: 450 +Shader version: 500 vertices = 4 vertex spacing = equal_spacing 0:? Sequence @@ -232,6 +232,7 @@ vertex spacing = equal_spacing ExecutionMode 4 OutputVertices 4 ExecutionMode 4 Isolines ExecutionMode 4 SpacingEqual + Source HLSL 500 Name 4 "main" Name 8 "VS_OUT" MemberName 8(VS_OUT) 0 "cpoint" diff --git a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out index e6deae4..3d2ff3d 100644 --- a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out +++ b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out @@ -1,5 +1,5 @@ hlsl.hull.ctrlpt-1.tesc -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_odd_spacing triangle order = cw @@ -200,7 +200,7 @@ triangle order = cw Linked tessellation control stage: -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_odd_spacing triangle order = cw @@ -409,6 +409,7 @@ triangle order = cw ExecutionMode 4 Triangles ExecutionMode 4 SpacingFractionalOdd ExecutionMode 4 VertexOrderCw + Source HLSL 500 Name 4 "main" Name 8 "hs_in_t" MemberName 8(hs_in_t) 0 "val" diff --git a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out index 886cff8..29ab61d 100644 --- a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out +++ b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out @@ -1,5 +1,5 @@ hlsl.hull.ctrlpt-2.tesc -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_odd_spacing triangle order = cw @@ -209,7 +209,7 @@ triangle order = cw Linked tessellation control stage: -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_odd_spacing triangle order = cw @@ -427,6 +427,7 @@ triangle order = cw ExecutionMode 4 Triangles ExecutionMode 4 SpacingFractionalOdd ExecutionMode 4 VertexOrderCw + Source HLSL 500 Name 4 "main" Name 8 "hs_in_t" MemberName 8(hs_in_t) 0 "val" diff --git a/Test/baseResults/hlsl.hull.void.tesc.out b/Test/baseResults/hlsl.hull.void.tesc.out index 20b8dd3..b6e417a 100644 --- a/Test/baseResults/hlsl.hull.void.tesc.out +++ b/Test/baseResults/hlsl.hull.void.tesc.out @@ -1,5 +1,5 @@ hlsl.hull.void.tesc -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_even_spacing 0:? Sequence @@ -54,7 +54,7 @@ vertex spacing = fractional_even_spacing Linked tessellation control stage: -Shader version: 450 +Shader version: 500 vertices = 3 vertex spacing = fractional_even_spacing 0:? Sequence @@ -116,6 +116,7 @@ vertex spacing = fractional_even_spacing ExecutionMode 4 OutputVertices 3 ExecutionMode 4 Triangles ExecutionMode 4 SpacingFractionalEven + Source HLSL 500 Name 4 "main" Name 8 "VS_OUT" MemberName 8(VS_OUT) 0 "cpoint" diff --git a/Test/baseResults/hlsl.identifier.sample.frag.out b/Test/baseResults/hlsl.identifier.sample.frag.out index 3583141..a8870b1 100644 --- a/Test/baseResults/hlsl.identifier.sample.frag.out +++ b/Test/baseResults/hlsl.identifier.sample.frag.out @@ -1,5 +1,5 @@ hlsl.identifier.sample.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: sample(i1; ( temp int) @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: sample(i1; ( temp int) @@ -94,6 +94,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 31 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "sample(i1;" Name 9 "x" diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out index 5cd09be..89e0bb1 100755 --- a/Test/baseResults/hlsl.if.frag.out +++ b/Test/baseResults/hlsl.if.frag.out @@ -1,5 +1,5 @@ hlsl.if.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -109,7 +109,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -224,6 +224,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 96 99 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.implicitBool.frag.out b/Test/baseResults/hlsl.implicitBool.frag.out index 032069d..34bbec2 100755 --- a/Test/baseResults/hlsl.implicitBool.frag.out +++ b/Test/baseResults/hlsl.implicitBool.frag.out @@ -1,5 +1,5 @@ hlsl.implicitBool.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @main( ( temp 4-component vector of float) @@ -167,7 +167,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @main( ( temp 4-component vector of float) @@ -340,6 +340,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 143 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 12 "a" diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out index 7ae9475..119d0c5 100755 --- a/Test/baseResults/hlsl.init.frag.out +++ b/Test/baseResults/hlsl.init.frag.out @@ -2,7 +2,7 @@ hlsl.init.frag WARNING: 0:40: 'typedef' : struct-member initializers ignored WARNING: 0:40: 'typedef' : struct-member initializers ignored -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -168,7 +168,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -339,6 +339,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "ShaderFunction" 98 101 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "ShaderFunction" Name 11 "@ShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index 33714aa..45eca98 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -1,5 +1,5 @@ hlsl.init2.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: Test1( ( temp void) @@ -180,7 +180,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: Test1( ( temp void) @@ -366,6 +366,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 109 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "Test1(" Name 10 "PS_OUTPUT" diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index 6501703..d5cce21 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -1,5 +1,5 @@ hlsl.inoutquals.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: MyFunc(f1;f1;f1; ( temp void) @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Function Definition: MyFunc(f1;f1;f1; ( temp void) @@ -197,6 +197,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 60 70 74 78 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "MyFunc(f1;f1;f1;" Name 9 "x" diff --git a/Test/baseResults/hlsl.intrinsic.frexp.frag.out b/Test/baseResults/hlsl.intrinsic.frexp.frag.out index fc827f8..e62399a 100644 --- a/Test/baseResults/hlsl.intrinsic.frexp.frag.out +++ b/Test/baseResults/hlsl.intrinsic.frexp.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsic.frexp.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: PixelShaderFunctionS(f1;f1; ( temp float) @@ -96,7 +96,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: PixelShaderFunctionS(f1;f1; ( temp float) @@ -198,6 +198,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 95 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "PixelShaderFunctionS(f1;f1;" Name 9 "inF0" diff --git a/Test/baseResults/hlsl.intrinsic.frexp.vert.out b/Test/baseResults/hlsl.intrinsic.frexp.vert.out index 4931b93..1827bd6 100644 --- a/Test/baseResults/hlsl.intrinsic.frexp.vert.out +++ b/Test/baseResults/hlsl.intrinsic.frexp.vert.out @@ -1,5 +1,5 @@ hlsl.intrinsic.frexp.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: VertexShaderFunctionS(f1;f1; ( temp float) 0:2 Function Parameters: @@ -58,7 +58,7 @@ Linked vertex stage: WARNING: Linking vertex stage: Entry point not found -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: VertexShaderFunctionS(f1;f1; ( temp float) 0:2 Function Parameters: @@ -120,6 +120,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "VertexShaderFunction" + Source HLSL 500 Name 4 "VertexShaderFunction" Name 11 "VertexShaderFunctionS(f1;f1;" Name 9 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out index c82ee0f..f7e3e22 100644 --- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out +++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out @@ -1,5 +1,5 @@ hlsl.intrinsics.barriers.comp -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:3 Function Definition: @ComputeShaderFunction( ( temp float) @@ -27,7 +27,7 @@ local_size = (1, 1, 1) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:3 Function Definition: @ComputeShaderFunction( ( temp float) @@ -60,6 +60,7 @@ local_size = (1, 1, 1) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "ComputeShaderFunction" 20 ExecutionMode 4 LocalSize 1 1 1 + Source HLSL 500 Name 4 "ComputeShaderFunction" Name 8 "@ComputeShaderFunction(" Name 20 "@entryPointOutput" diff --git a/Test/baseResults/hlsl.intrinsics.comp.out b/Test/baseResults/hlsl.intrinsics.comp.out index c4f7ac8..bff1886 100644 --- a/Test/baseResults/hlsl.intrinsics.comp.out +++ b/Test/baseResults/hlsl.intrinsics.comp.out @@ -1,5 +1,5 @@ hlsl.intrinsics.comp -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:17 Function Definition: ComputeShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) @@ -355,7 +355,7 @@ local_size = (1, 1, 1) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:17 Function Definition: ComputeShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) @@ -716,6 +716,7 @@ local_size = (1, 1, 1) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "ComputeShaderFunction" 227 230 233 237 240 243 ExecutionMode 4 LocalSize 1 1 1 + Source HLSL 500 Name 4 "ComputeShaderFunction" Name 16 "ComputeShaderFunctionS(f1;f1;f1;u1;u1;" Name 11 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out index e38e621..94b4ad7 100644 --- a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out +++ b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.d3dcolortoubyte4.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of int) @@ -38,7 +38,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of int) @@ -82,6 +82,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 27 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 14 "$Global" diff --git a/Test/baseResults/hlsl.intrinsics.double.frag.out b/Test/baseResults/hlsl.intrinsics.double.frag.out index 1a6524f..f08775a 100644 --- a/Test/baseResults/hlsl.intrinsics.double.frag.out +++ b/Test/baseResults/hlsl.intrinsics.double.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.double.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1; ( temp float) @@ -83,7 +83,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1; ( temp float) @@ -173,6 +173,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 44 47 50 54 58 62 66 69 72 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 26 "@PixelShaderFunction(d1;d1;d1;vd2;vd3;vd4;u1;u1;" Name 18 "inDV1a" diff --git a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out index 6d96f16..90a4db5 100644 --- a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out +++ b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.evalfns.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main(f1;vf2;vf3;vf4;vi2; ( temp void) @@ -78,7 +78,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main(f1;vf2;vf3;vf4;vi2; ( temp void) @@ -163,6 +163,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 51 55 59 63 67 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 23 "@main(f1;vf2;vf3;vf4;vi2;" Name 18 "inF1" diff --git a/Test/baseResults/hlsl.intrinsics.f1632.frag.out b/Test/baseResults/hlsl.intrinsics.f1632.frag.out index 6b9a18b..e828d96 100644 --- a/Test/baseResults/hlsl.intrinsics.f1632.frag.out +++ b/Test/baseResults/hlsl.intrinsics.f1632.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.f1632.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunctionS(u1; ( temp float) @@ -131,7 +131,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunctionS(u1; ( temp float) @@ -268,6 +268,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 101 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "PixelShaderFunctionS(u1;" Name 10 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.f3216.frag.out b/Test/baseResults/hlsl.intrinsics.f3216.frag.out index 30edb0a..3ff9ce7 100644 --- a/Test/baseResults/hlsl.intrinsics.f3216.frag.out +++ b/Test/baseResults/hlsl.intrinsics.f3216.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.f3216.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunctionS(f1; ( temp uint) @@ -136,7 +136,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunctionS(f1; ( temp uint) @@ -278,6 +278,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 104 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "PixelShaderFunctionS(f1;" Name 10 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 0657894..289592a 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:17 Function Definition: PixelShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) @@ -2762,7 +2762,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:17 Function Definition: PixelShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) @@ -5531,6 +5531,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 1772 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 16 "PixelShaderFunctionS(f1;f1;f1;u1;u1;" Name 11 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.lit.frag.out b/Test/baseResults/hlsl.intrinsics.lit.frag.out index affed16..61024f4 100644 --- a/Test/baseResults/hlsl.intrinsics.lit.frag.out +++ b/Test/baseResults/hlsl.intrinsics.lit.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.lit.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(f1;f1;f1; ( temp void) @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(f1;f1;f1; ( temp void) @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 37 40 43 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 12 "@PixelShaderFunction(f1;f1;f1;" Name 9 "n_dot_l" diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out index 2c8b915..176cf23 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.comp.out +++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out @@ -1,5 +1,5 @@ hlsl.intrinsics.negative.comp -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:2 Function Definition: ComputeShaderFunctionS(f1;f1;f1;i1; ( temp float) @@ -91,7 +91,7 @@ local_size = (1, 1, 1) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (1, 1, 1) 0:? Sequence 0:2 Function Definition: ComputeShaderFunctionS(f1;f1;f1;i1; ( temp float) @@ -188,6 +188,7 @@ local_size = (1, 1, 1) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "ComputeShaderFunction" 76 79 82 86 89 ExecutionMode 4 LocalSize 1 1 1 + Source HLSL 500 Name 4 "ComputeShaderFunction" Name 15 "ComputeShaderFunctionS(f1;f1;f1;i1;" Name 11 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.negative.frag.out b/Test/baseResults/hlsl.intrinsics.negative.frag.out index 4c514d0..591ad13 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.frag.out +++ b/Test/baseResults/hlsl.intrinsics.negative.frag.out @@ -61,7 +61,7 @@ ERROR: 0:133: 'reversebits' : no matching overloaded function found ERROR: 59 compilation errors. No code generated. -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:2 Function Definition: PixelShaderFunctionS(f1;f1;f1;i1; ( temp float) @@ -522,7 +522,7 @@ ERROR: node is still EOpNull! Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:2 Function Definition: PixelShaderFunctionS(f1;f1;f1;i1; ( temp float) diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out index 9808b1c..aabcda8 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.vert.out +++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out @@ -1,5 +1,5 @@ hlsl.intrinsics.negative.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:15 Function Definition: VertexShaderFunctionS(f1;f1;f1;i1; ( temp float) 0:15 Function Parameters: @@ -155,7 +155,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:15 Function Definition: VertexShaderFunctionS(f1;f1;f1;i1; ( temp float) 0:15 Function Parameters: @@ -315,6 +315,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "VertexShaderFunction" 100 103 106 110 113 + Source HLSL 500 Name 4 "VertexShaderFunction" Name 15 "VertexShaderFunctionS(f1;f1;f1;i1;" Name 11 "inF0" diff --git a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out index 4f47d86..d67b2e8 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.promote.down.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:15 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:15 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -112,6 +112,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 47 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.intrinsics.promote.frag.out b/Test/baseResults/hlsl.intrinsics.promote.frag.out index 4cdf62b..b62d30d 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.promote.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -445,7 +445,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -899,6 +899,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 319 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out index c6e4619..87b425f 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out @@ -1,5 +1,5 @@ hlsl.intrinsics.promote.outputs.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -103,7 +103,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -215,6 +215,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 74 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.intrinsics.vert.out b/Test/baseResults/hlsl.intrinsics.vert.out index 8de7d75..82bb18e 100644 --- a/Test/baseResults/hlsl.intrinsics.vert.out +++ b/Test/baseResults/hlsl.intrinsics.vert.out @@ -1,5 +1,5 @@ hlsl.intrinsics.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: VertexShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) 0:2 Function Parameters: @@ -1377,7 +1377,7 @@ Linked vertex stage: WARNING: Linking vertex stage: Entry point not found -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: VertexShaderFunctionS(f1;f1;f1;u1;u1; ( temp float) 0:2 Function Parameters: @@ -2758,6 +2758,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "VertexShaderFunction" + Source HLSL 500 Name 4 "VertexShaderFunction" Name 16 "VertexShaderFunctionS(f1;f1;f1;u1;u1;" Name 11 "inF0" diff --git a/Test/baseResults/hlsl.isfinite.frag.out b/Test/baseResults/hlsl.isfinite.frag.out index 652777a..0687c0d 100644 --- a/Test/baseResults/hlsl.isfinite.frag.out +++ b/Test/baseResults/hlsl.isfinite.frag.out @@ -1,5 +1,5 @@ hlsl.isfinite.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of float) @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of float) @@ -84,6 +84,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 36 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 12 "@finitetmp" diff --git a/Test/baseResults/hlsl.layout.frag.out b/Test/baseResults/hlsl.layout.frag.out index 6a5eceb..b8a96cf 100755 --- a/Test/baseResults/hlsl.layout.frag.out +++ b/Test/baseResults/hlsl.layout.frag.out @@ -1,5 +1,5 @@ hlsl.layout.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:16 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -35,7 +35,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:16 Function Definition: PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -75,6 +75,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index f436f88..251d56e 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.2dms.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -366,6 +366,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 120 124 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 9430e75..78e2b2c 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -194,7 +194,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -396,6 +396,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 104 108 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 6a976f0..0da4048 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -498,6 +498,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 133 137 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index a41675c..c3b7dc2 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -1,5 +1,5 @@ hlsl.load.basic.dx10.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:47 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:47 Function Parameters: @@ -227,7 +227,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:47 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:47 Function Parameters: @@ -461,6 +461,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 129 173 + Source HLSL 500 Name 4 "main" Name 8 "VS_OUTPUT" MemberName 8(VS_OUTPUT) 0 "Pos" diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index f111dd5..e68e5f9 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.buffer.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -83,7 +83,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -173,6 +173,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 64 68 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out index 31e7927..ff686a3 100644 --- a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.buffer.float.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -179,6 +179,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 67 71 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index 7d6c63a..473db61 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -281,7 +281,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -571,6 +571,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 155 159 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index f20b607..4b6a09f 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -218,7 +218,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:48 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -445,6 +445,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 119 123 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out index ea8bdd2..3e748cc 100644 --- a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.rwbuffer.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:22 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:22 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -119,6 +119,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 54 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out index fba29c1..884ed8f 100644 --- a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.rwtexture.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -104,7 +104,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -215,6 +215,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 82 86 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out index 2b05b31..3061867 100644 --- a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.load.rwtexture.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -122,7 +122,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -251,6 +251,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 104 108 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.logical.binary.frag.out b/Test/baseResults/hlsl.logical.binary.frag.out index 7aec275..587e3d5 100644 --- a/Test/baseResults/hlsl.logical.binary.frag.out +++ b/Test/baseResults/hlsl.logical.binary.frag.out @@ -1,5 +1,5 @@ hlsl.logical.binary.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -65,7 +65,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -136,6 +136,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 59 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.logical.binary.vec.frag.out b/Test/baseResults/hlsl.logical.binary.vec.frag.out index 38708ef..a03890c 100644 --- a/Test/baseResults/hlsl.logical.binary.vec.frag.out +++ b/Test/baseResults/hlsl.logical.binary.vec.frag.out @@ -1,5 +1,5 @@ hlsl.logical.binary.vec.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -128,7 +128,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -262,6 +262,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 117 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.logical.unary.frag.out b/Test/baseResults/hlsl.logical.unary.frag.out index 885a796..7121d92 100644 --- a/Test/baseResults/hlsl.logical.unary.frag.out +++ b/Test/baseResults/hlsl.logical.unary.frag.out @@ -1,5 +1,5 @@ hlsl.logical.unary.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -93,7 +93,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -192,6 +192,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 81 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.logicalConvert.frag.out b/Test/baseResults/hlsl.logicalConvert.frag.out index ca3fe58..a49a718 100755 --- a/Test/baseResults/hlsl.logicalConvert.frag.out +++ b/Test/baseResults/hlsl.logicalConvert.frag.out @@ -1,5 +1,5 @@ hlsl.logicalConvert.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @main( ( temp 4-component vector of float) @@ -84,7 +84,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @main( ( temp 4-component vector of float) @@ -174,6 +174,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 36 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 36 "@entryPointOutput" diff --git a/Test/baseResults/hlsl.matNx1.frag.out b/Test/baseResults/hlsl.matNx1.frag.out index cd0dbbf..0360db4 100644 --- a/Test/baseResults/hlsl.matNx1.frag.out +++ b/Test/baseResults/hlsl.matNx1.frag.out @@ -1,5 +1,5 @@ hlsl.matNx1.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestMatNx1( ( temp void) @@ -77,7 +77,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestMatNx1( ( temp void) @@ -160,6 +160,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 74 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "TestMatNx1(" Name 10 "PS_OUTPUT" diff --git a/Test/baseResults/hlsl.matType.bool.frag.out b/Test/baseResults/hlsl.matType.bool.frag.out index b1c5762..3f261a3 100644 --- a/Test/baseResults/hlsl.matType.bool.frag.out +++ b/Test/baseResults/hlsl.matType.bool.frag.out @@ -1,5 +1,5 @@ hlsl.matType.bool.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestBoolMatTypes( ( temp void) @@ -117,7 +117,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestBoolMatTypes( ( temp void) @@ -240,6 +240,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 127 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "TestBoolMatTypes(" Name 10 "PS_OUTPUT" diff --git a/Test/baseResults/hlsl.matType.frag.out b/Test/baseResults/hlsl.matType.frag.out index ee40879..d76d55c 100755 --- a/Test/baseResults/hlsl.matType.frag.out +++ b/Test/baseResults/hlsl.matType.frag.out @@ -1,5 +1,5 @@ hlsl.matType.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: ShaderFunction(vf1;f1; ( temp 1-component vector of float) @@ -17,7 +17,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: ShaderFunction(vf1;f1; ( temp 1-component vector of float) @@ -40,6 +40,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "ShaderFunction(vf1;f1;" Name 9 "inFloat1" diff --git a/Test/baseResults/hlsl.matType.int.frag.out b/Test/baseResults/hlsl.matType.int.frag.out index aef7862..602f068 100644 --- a/Test/baseResults/hlsl.matType.int.frag.out +++ b/Test/baseResults/hlsl.matType.int.frag.out @@ -1,5 +1,5 @@ hlsl.matType.int.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestIntMatTypes( ( temp void) @@ -200,7 +200,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: TestIntMatTypes( ( temp void) @@ -406,6 +406,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 229 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "TestIntMatTypes(" Name 8 "TestUintMatTypes(" diff --git a/Test/baseResults/hlsl.matrixSwizzle.vert.out b/Test/baseResults/hlsl.matrixSwizzle.vert.out index 69c774b..7e792b4 100755 --- a/Test/baseResults/hlsl.matrixSwizzle.vert.out +++ b/Test/baseResults/hlsl.matrixSwizzle.vert.out @@ -1,5 +1,5 @@ hlsl.matrixSwizzle.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: @ShaderFunction(f1; ( temp void) 0:2 Function Parameters: @@ -339,7 +339,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:2 Function Definition: @ShaderFunction(f1; ( temp void) 0:2 Function Parameters: @@ -684,6 +684,7 @@ Missing functionality: matrix swizzle 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "ShaderFunction" 81 + Source HLSL 500 Name 4 "ShaderFunction" Name 10 "@ShaderFunction(f1;" Name 9 "inf" diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out index 6f2339c..9741c5d 100644 --- a/Test/baseResults/hlsl.matrixindex.frag.out +++ b/Test/baseResults/hlsl.matrixindex.frag.out @@ -1,5 +1,5 @@ hlsl.matrixindex.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -137,7 +137,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -280,6 +280,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 80 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.max.frag.out b/Test/baseResults/hlsl.max.frag.out index 6a0762e..2c74d72 100755 --- a/Test/baseResults/hlsl.max.frag.out +++ b/Test/baseResults/hlsl.max.frag.out @@ -1,5 +1,5 @@ hlsl.max.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4;vf4; ( temp 4-component vector of float) @@ -34,7 +34,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4;vf4; ( temp 4-component vector of float) @@ -74,6 +74,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 21 24 27 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 12 "@PixelShaderFunction(vf4;vf4;" Name 10 "input1" diff --git a/Test/baseResults/hlsl.mintypes.frag.out b/Test/baseResults/hlsl.mintypes.frag.out index 257d7e4..1cbd477 100644 --- a/Test/baseResults/hlsl.mintypes.frag.out +++ b/Test/baseResults/hlsl.mintypes.frag.out @@ -1,5 +1,5 @@ hlsl.mintypes.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -106,6 +106,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 64 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.multiEntry.vert.out b/Test/baseResults/hlsl.multiEntry.vert.out index fd4a574..8a309da 100755 --- a/Test/baseResults/hlsl.multiEntry.vert.out +++ b/Test/baseResults/hlsl.multiEntry.vert.out @@ -1,5 +1,5 @@ hlsl.multiEntry.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:4 Function Definition: FakeEntrypoint(u1; ( temp 4-component vector of float) 0:4 Function Parameters: @@ -36,7 +36,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:4 Function Definition: FakeEntrypoint(u1; ( temp 4-component vector of float) 0:4 Function Parameters: @@ -78,6 +78,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "RealEntrypoint" 34 37 + Source HLSL 500 Name 4 "RealEntrypoint" Name 12 "FakeEntrypoint(u1;" Name 11 "Index" diff --git a/Test/baseResults/hlsl.multiReturn.frag.out b/Test/baseResults/hlsl.multiReturn.frag.out index 9efc9fc..1569b42 100755 --- a/Test/baseResults/hlsl.multiReturn.frag.out +++ b/Test/baseResults/hlsl.multiReturn.frag.out @@ -1,5 +1,5 @@ hlsl.multiReturn.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: foo( ( temp structure{ temp float f, temp 3-component vector of float v, temp 3X3 matrix of float m}) @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: foo( ( temp structure{ temp float f, temp 3-component vector of float v, temp 3X3 matrix of float m}) @@ -56,6 +56,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "S" MemberName 9(S) 0 "f" diff --git a/Test/baseResults/hlsl.namespace.frag.out b/Test/baseResults/hlsl.namespace.frag.out index dae874f..82fbb6e 100755 --- a/Test/baseResults/hlsl.namespace.frag.out +++ b/Test/baseResults/hlsl.namespace.frag.out @@ -1,5 +1,5 @@ hlsl.namespace.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: N1::getVec( ( temp 4-component vector of float) @@ -52,7 +52,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: N1::getVec( ( temp 4-component vector of float) @@ -110,6 +110,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 52 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "N1::getVec(" Name 11 "N2::getVec(" diff --git a/Test/baseResults/hlsl.nonint-index.frag.out b/Test/baseResults/hlsl.nonint-index.frag.out index 68c02a3..3684cf3 100644 --- a/Test/baseResults/hlsl.nonint-index.frag.out +++ b/Test/baseResults/hlsl.nonint-index.frag.out @@ -1,5 +1,5 @@ hlsl.nonint-index.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main(f1; ( temp float) @@ -45,7 +45,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main(f1; ( temp float) @@ -96,6 +96,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 32 35 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "@main(f1;" Name 9 "input" diff --git a/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out b/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out index d3049ec..27326c6 100755 --- a/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out +++ b/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out @@ -1,5 +1,5 @@ hlsl.nonstaticMemberFunction.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -135,7 +135,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -276,6 +276,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 109 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "type1" MemberName 9(type1) 0 "memVar" diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index cb24669..ee25cb3 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -1,5 +1,5 @@ hlsl.numericsuffixes.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -97,7 +97,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp structure{ temp 4-component vector of float color}) @@ -200,6 +200,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 51 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.numthreads.comp.out b/Test/baseResults/hlsl.numthreads.comp.out index ed0017b..fc1345f 100644 --- a/Test/baseResults/hlsl.numthreads.comp.out +++ b/Test/baseResults/hlsl.numthreads.comp.out @@ -1,5 +1,5 @@ hlsl.numthreads.comp -Shader version: 450 +Shader version: 500 local_size = (4, 4, 2) 0:? Sequence 0:4 Function Definition: main(vu3; ( temp void) @@ -23,7 +23,7 @@ local_size = (4, 4, 2) Linked compute stage: -Shader version: 450 +Shader version: 500 local_size = (4, 4, 2) 0:? Sequence 0:4 Function Definition: main(vu3; ( temp void) @@ -52,6 +52,7 @@ local_size = (4, 4, 2) MemoryModel Logical GLSL450 EntryPoint GLCompute 4 "main_aux1" 18 ExecutionMode 4 LocalSize 4 4 2 + Source HLSL 500 Name 4 "main_aux1" Name 11 "main(vu3;" Name 10 "tid" diff --git a/Test/baseResults/hlsl.overload.frag.out b/Test/baseResults/hlsl.overload.frag.out index 1075ffe..b390526 100755 --- a/Test/baseResults/hlsl.overload.frag.out +++ b/Test/baseResults/hlsl.overload.frag.out @@ -1,5 +1,5 @@ hlsl.overload.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo1(d1;b1; ( temp void) @@ -368,7 +368,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo1(d1;b1; ( temp void) @@ -743,6 +743,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 513 516 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 13 "foo1(d1;b1;" Name 11 "a" diff --git a/Test/baseResults/hlsl.params.default.frag.out b/Test/baseResults/hlsl.params.default.frag.out index b8ddf0d..3643c23 100644 --- a/Test/baseResults/hlsl.params.default.frag.out +++ b/Test/baseResults/hlsl.params.default.frag.out @@ -1,5 +1,5 @@ hlsl.params.default.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: fn1(vi4;b1;b1; ( temp 4-component vector of int) @@ -189,7 +189,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:9 Function Definition: fn1(vi4;b1;b1; ( temp 4-component vector of int) @@ -384,6 +384,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 175 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 15 "fn1(vi4;b1;b1;" Name 12 "p0" diff --git a/Test/baseResults/hlsl.params.default.negative.frag.out b/Test/baseResults/hlsl.params.default.negative.frag.out index 219e920..f841bd8 100644 --- a/Test/baseResults/hlsl.params.default.negative.frag.out +++ b/Test/baseResults/hlsl.params.default.negative.frag.out @@ -6,7 +6,7 @@ ERROR: 0:47: 'fn2' : ambiguous best function under implicit type conversion ERROR: 4 compilation errors. No code generated. -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:7 Function Definition: fn1(vi4; ( temp 4-component vector of int) @@ -196,7 +196,7 @@ ERROR: node is still EOpNull! Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left ERROR: node is still EOpNull! 0:7 Function Definition: fn1(vi4; ( temp 4-component vector of int) diff --git a/Test/baseResults/hlsl.partialInit.frag.out b/Test/baseResults/hlsl.partialInit.frag.out index 2dc40be..b326799 100755 --- a/Test/baseResults/hlsl.partialInit.frag.out +++ b/Test/baseResults/hlsl.partialInit.frag.out @@ -2,7 +2,7 @@ hlsl.partialInit.frag WARNING: 0:35: 'cgf2a' : variable with qualifier 'const' not initialized; zero initializing WARNING: 0:36: 'ci' : variable with qualifier 'const' not initialized; zero initializing -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence @@ -202,7 +202,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence @@ -407,6 +407,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 80 87 91 95 99 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "outs" MemberName 11(outs) 0 "a" diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 6e8998d..727fdd0 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -1,5 +1,5 @@ hlsl.pp.line.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 35 39 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.precedence.frag.out b/Test/baseResults/hlsl.precedence.frag.out index 54dcf31..a46c6fb 100755 --- a/Test/baseResults/hlsl.precedence.frag.out +++ b/Test/baseResults/hlsl.precedence.frag.out @@ -1,5 +1,5 @@ hlsl.precedence.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4; ( temp 4-component vector of float) @@ -75,7 +75,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vf4; ( temp 4-component vector of float) @@ -156,6 +156,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 43 46 49 52 55 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 14 "@PixelShaderFunction(vf4;vf4;vf4;vf4;" Name 10 "a1" diff --git a/Test/baseResults/hlsl.precedence2.frag.out b/Test/baseResults/hlsl.precedence2.frag.out index a0ddd44..31e76c3 100755 --- a/Test/baseResults/hlsl.precedence2.frag.out +++ b/Test/baseResults/hlsl.precedence2.frag.out @@ -1,5 +1,5 @@ hlsl.precedence2.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @PixelShaderFunction(i1;i1;i1;i1; ( temp int) @@ -58,7 +58,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @PixelShaderFunction(i1;i1;i1;i1; ( temp int) @@ -122,6 +122,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 34 37 40 43 46 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 13 "@PixelShaderFunction(i1;i1;i1;i1;" Name 9 "a1" diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index 8a0ac81..442f6c2 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -1,5 +1,5 @@ hlsl.precise.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:6 Function Definition: MyFunction(f1;vf3; ( temp void) @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:6 Function Definition: MyFunction(f1;vf3; ( temp void) @@ -84,6 +84,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 32 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 13 "MyFunction(f1;vf3;" Name 11 "myfloat" diff --git a/Test/baseResults/hlsl.promote.atomic.frag.out b/Test/baseResults/hlsl.promote.atomic.frag.out index b09f68d..b31ac61 100644 --- a/Test/baseResults/hlsl.promote.atomic.frag.out +++ b/Test/baseResults/hlsl.promote.atomic.frag.out @@ -1,5 +1,5 @@ hlsl.promote.atomic.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of float) @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main( ( temp 4-component vector of float) @@ -73,6 +73,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 34 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 13 "Orig" diff --git a/Test/baseResults/hlsl.promote.binary.frag.out b/Test/baseResults/hlsl.promote.binary.frag.out index 34a46f9..09c1f93 100644 --- a/Test/baseResults/hlsl.promote.binary.frag.out +++ b/Test/baseResults/hlsl.promote.binary.frag.out @@ -1,5 +1,5 @@ hlsl.promote.binary.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:14 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -87,7 +87,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:14 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -180,6 +180,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 80 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.promote.vec1.frag.out b/Test/baseResults/hlsl.promote.vec1.frag.out index c76f5d2..b0536bd 100644 --- a/Test/baseResults/hlsl.promote.vec1.frag.out +++ b/Test/baseResults/hlsl.promote.vec1.frag.out @@ -1,5 +1,5 @@ hlsl.promote.vec1.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main( ( temp 4-component vector of float) @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main( ( temp 4-component vector of float) @@ -88,6 +88,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 29 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 12 "f1a" diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index d955195..e1953e0 100644 --- a/Test/baseResults/hlsl.promotions.frag.out +++ b/Test/baseResults/hlsl.promotions.frag.out @@ -1,5 +1,5 @@ hlsl.promotions.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:19 Function Definition: Fn_F3(vf3; ( temp void) @@ -792,7 +792,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:19 Function Definition: Fn_F3(vf3; ( temp void) @@ -1591,6 +1591,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 593 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Fn_F3(vf3;" Name 10 "x" diff --git a/Test/baseResults/hlsl.rw.atomics.frag.out b/Test/baseResults/hlsl.rw.atomics.frag.out index a2e5358..08369c0 100644 --- a/Test/baseResults/hlsl.rw.atomics.frag.out +++ b/Test/baseResults/hlsl.rw.atomics.frag.out @@ -1,5 +1,5 @@ hlsl.rw.atomics.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:45 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -1974,7 +1974,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:45 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -3956,6 +3956,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 1117 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.rw.bracket.frag.out b/Test/baseResults/hlsl.rw.bracket.frag.out index ece7bfa..55264de 100644 --- a/Test/baseResults/hlsl.rw.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.bracket.frag.out @@ -1,5 +1,5 @@ hlsl.rw.bracket.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(vi4; ( temp 4-component vector of int) @@ -873,7 +873,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(vi4; ( temp 4-component vector of int) @@ -1753,6 +1753,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 583 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Fn1(vi4;" Name 10 "x" diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out index 2e0c562..525c6aa 100644 --- a/Test/baseResults/hlsl.rw.register.frag.out +++ b/Test/baseResults/hlsl.rw.register.frag.out @@ -1,5 +1,5 @@ hlsl.rw.register.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:11 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:11 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -108,6 +108,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 39 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out index 991d524..e0e88d1 100644 --- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out @@ -1,5 +1,5 @@ hlsl.rw.scalar.bracket.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(i1; ( temp int) @@ -846,7 +846,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(i1; ( temp int) @@ -1699,6 +1699,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 547 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "Fn1(i1;" Name 9 "x" diff --git a/Test/baseResults/hlsl.rw.swizzle.frag.out b/Test/baseResults/hlsl.rw.swizzle.frag.out index ae2f4c9..60a6b99 100644 --- a/Test/baseResults/hlsl.rw.swizzle.frag.out +++ b/Test/baseResults/hlsl.rw.swizzle.frag.out @@ -1,5 +1,5 @@ hlsl.rw.swizzle.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: SomeValue( ( temp 3-component vector of float) @@ -102,7 +102,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: SomeValue( ( temp 3-component vector of float) @@ -211,6 +211,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 58 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "SomeValue(" Name 13 "@main(" diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out index c34ce90..afcc52a 100644 --- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out @@ -1,5 +1,5 @@ hlsl.rw.vec2.bracket.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(vi2; ( temp 2-component vector of int) @@ -855,7 +855,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:42 Function Definition: Fn1(vi2; ( temp 2-component vector of int) @@ -1718,6 +1718,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 581 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Fn1(vi2;" Name 10 "x" diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 5a8a79c..1ac123e 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.sample.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -161,7 +161,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -330,6 +330,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 138 142 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 725de27..61abf2a 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -1,7 +1,7 @@ hlsl.sample.basic.dx10.frag WARNING: 0:4: 'immediate sampler state' : unimplemented -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:53 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -276,7 +276,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:53 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -557,6 +557,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 188 192 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index 923db24..f6bfb8d 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.sample.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -371,6 +371,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 144 148 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index d9cf65c..c08ec5c 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.sample.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -137,7 +137,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -281,6 +281,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 110 114 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out index c3d6f13..2829c02 100644 --- a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.sample.sub-vec4.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:14 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -78,7 +78,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:14 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -163,6 +163,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 69 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index 7f6881f..afed0a4 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplebias.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -366,6 +366,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 138 142 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index 81e8da9..cff271f 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplebias.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -212,7 +212,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -431,6 +431,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 162 166 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index 1919132..b05d1d7 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplebias.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -200,7 +200,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -407,6 +407,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 144 148 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 0aab048..e718743 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplebias.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -149,7 +149,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -305,6 +305,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 110 114 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index 6f26c98..1ddff1a 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmp.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -199,7 +199,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -406,6 +406,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 175 179 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index df1004e..373423a 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmp.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -190,7 +190,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -388,6 +388,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 164 168 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index a6193fd..290c8b4 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmp.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -163,7 +163,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -334,6 +334,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 121 125 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index 2fdce67..ed40102 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmp.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -169,7 +169,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -346,6 +346,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 132 136 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index 3a3e169..875d593 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmplevelzero.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -217,7 +217,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -442,6 +442,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 176 180 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 1fcc001..9d2802d 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmplevelzero.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -208,7 +208,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -424,6 +424,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 165 169 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index 1bd82be..2e30e7c 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmplevelzero.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -175,7 +175,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -358,6 +358,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 122 126 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 8a87e9b..eda17f2 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplecmplevelzero.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -181,7 +181,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -370,6 +370,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 133 137 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 5a5159d..03449f8 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplegrad.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -215,7 +215,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -438,6 +438,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 132 136 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index dc61751..42a27bf 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplegrad.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -266,7 +266,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -539,6 +539,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 167 171 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index afce97f..a93cbdf 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -1,5 +1,5 @@ hlsl.samplegrad.basic.dx10.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:27 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Function Parameters: @@ -248,7 +248,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:27 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Function Parameters: @@ -502,6 +502,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 162 168 + Source HLSL 500 Name 4 "main" Name 8 "VS_OUTPUT" MemberName 8(VS_OUTPUT) 0 "Pos" diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 9da0f17..4b4e718 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplegrad.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -236,7 +236,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -479,6 +479,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 149 153 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index a2abd0f..1f714e6 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplegrad.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -170,7 +170,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -348,6 +348,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 103 107 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 88c7de9..0a3e7fd 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplelevel.array.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:24 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -366,6 +366,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 139 143 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 7d9f268..6ff36be 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplelevel.basic.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:29 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -213,7 +213,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:29 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -433,6 +433,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 163 167 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index 40996e9..5b2f950 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -1,5 +1,5 @@ hlsl.samplelevel.basic.dx10.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:27 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Function Parameters: @@ -194,7 +194,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:27 Function Definition: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Function Parameters: @@ -394,6 +394,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 158 164 + Source HLSL 500 Name 4 "main" Name 8 "VS_OUTPUT" MemberName 8(VS_OUTPUT) 0 "Pos" diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 2c98171..7311ae4 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplelevel.offset.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -200,7 +200,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:28 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -407,6 +407,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 145 149 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index 06b4c7b..223bfaf 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -1,5 +1,5 @@ hlsl.samplelevel.offsetarray.dx10.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -149,7 +149,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:20 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) @@ -305,6 +305,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 111 115 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.scalar-length.frag.out b/Test/baseResults/hlsl.scalar-length.frag.out index a0603a4..2854835 100644 --- a/Test/baseResults/hlsl.scalar-length.frag.out +++ b/Test/baseResults/hlsl.scalar-length.frag.out @@ -1,5 +1,5 @@ hlsl.scalar-length.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @main( ( temp 4-component vector of float) @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @main( ( temp 4-component vector of float) @@ -72,6 +72,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 28 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 12 "test" diff --git a/Test/baseResults/hlsl.scalarCast.vert.out b/Test/baseResults/hlsl.scalarCast.vert.out index efb08b1..c7ac142 100755 --- a/Test/baseResults/hlsl.scalarCast.vert.out +++ b/Test/baseResults/hlsl.scalarCast.vert.out @@ -1,5 +1,5 @@ hlsl.scalarCast.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:5 Function Definition: r0( ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:5 Function Parameters: @@ -164,7 +164,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:5 Function Definition: r0( ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:5 Function Parameters: @@ -333,6 +333,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 108 116 + Source HLSL 500 Name 4 "main" Name 9 "VertexOut" MemberName 9(VertexOut) 0 "position" diff --git a/Test/baseResults/hlsl.scope.frag.out b/Test/baseResults/hlsl.scope.frag.out index d3409d8..32eeeef 100755 --- a/Test/baseResults/hlsl.scope.frag.out +++ b/Test/baseResults/hlsl.scope.frag.out @@ -1,5 +1,5 @@ hlsl.scope.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp void) @@ -52,7 +52,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp void) @@ -110,6 +110,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 44 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.semantic.geom.out b/Test/baseResults/hlsl.semantic.geom.out index 2263200..e5d67b9 100755 --- a/Test/baseResults/hlsl.semantic.geom.out +++ b/Test/baseResults/hlsl.semantic.geom.out @@ -1,5 +1,5 @@ hlsl.semantic.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 4 input primitive = triangles @@ -67,7 +67,7 @@ output primitive = line_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 4 input primitive = triangles @@ -146,6 +146,7 @@ output primitive = line_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputLineStrip ExecutionMode 4 OutputVertices 4 + Source HLSL 500 Name 4 "main" Name 12 "S" MemberName 12(S) 0 "clip0" diff --git a/Test/baseResults/hlsl.semantic.vert.out b/Test/baseResults/hlsl.semantic.vert.out index 0b08856..3618fee 100755 --- a/Test/baseResults/hlsl.semantic.vert.out +++ b/Test/baseResults/hlsl.semantic.vert.out @@ -1,5 +1,5 @@ hlsl.semantic.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:12 Function Definition: @main(struct-S-f1-f1-f1-f1-f1-f1-i11; ( temp structure{ temp float clip, temp float clip0, temp float clip7, temp float cull, temp float cull2, temp float cull5, temp int ii}) 0:12 Function Parameters: @@ -117,7 +117,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:12 Function Definition: @main(struct-S-f1-f1-f1-f1-f1-f1-i11; ( temp structure{ temp float clip, temp float clip0, temp float clip7, temp float cull, temp float cull2, temp float cull5, temp int ii}) 0:12 Function Parameters: @@ -241,6 +241,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 21 26 30 34 38 42 47 56 63 72 + Source HLSL 500 Name 4 "main" Name 8 "S" MemberName 8(S) 0 "clip" diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index 9856b5a..2c26daa 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -1,5 +1,5 @@ hlsl.semicolons.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: MyFunc( ( temp void) @@ -38,7 +38,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: MyFunc( ( temp void) @@ -82,6 +82,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 28 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 6 "MyFunc(" Name 8 "MyFunc2(" diff --git a/Test/baseResults/hlsl.shapeConv.frag.out b/Test/baseResults/hlsl.shapeConv.frag.out index 07fa9fd..775549f 100755 --- a/Test/baseResults/hlsl.shapeConv.frag.out +++ b/Test/baseResults/hlsl.shapeConv.frag.out @@ -1,5 +1,5 @@ hlsl.shapeConv.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunction(vf4;f1; ( temp 4-component vector of float) @@ -117,7 +117,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: PixelShaderFunction(vf4;f1; ( temp 4-component vector of float) @@ -239,6 +239,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 13 "PixelShaderFunction(vf4;f1;" Name 11 "input" diff --git a/Test/baseResults/hlsl.shapeConvRet.frag.out b/Test/baseResults/hlsl.shapeConvRet.frag.out index 54ca7fa..e9dba22 100755 --- a/Test/baseResults/hlsl.shapeConvRet.frag.out +++ b/Test/baseResults/hlsl.shapeConvRet.frag.out @@ -1,5 +1,5 @@ hlsl.shapeConvRet.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo( ( temp 3-component vector of int) @@ -35,7 +35,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: foo( ( temp 3-component vector of int) @@ -76,6 +76,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 28 31 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "foo(" Name 16 "@main(f1;" diff --git a/Test/baseResults/hlsl.sin.frag.out b/Test/baseResults/hlsl.sin.frag.out index 1f96440..37baab0 100755 --- a/Test/baseResults/hlsl.sin.frag.out +++ b/Test/baseResults/hlsl.sin.frag.out @@ -1,5 +1,5 @@ hlsl.sin.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -27,7 +27,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -60,6 +60,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 19 22 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.staticMemberFunction.frag.out b/Test/baseResults/hlsl.staticMemberFunction.frag.out index e8a98cb..e313cbc 100755 --- a/Test/baseResults/hlsl.staticMemberFunction.frag.out +++ b/Test/baseResults/hlsl.staticMemberFunction.frag.out @@ -1,5 +1,5 @@ hlsl.staticMemberFunction.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: Test::staticMemFun(vf4; ( global 4-component vector of float) @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: Test::staticMemFun(vf4; ( global 4-component vector of float) @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 52 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Test::staticMemFun(vf4;" Name 10 "a" diff --git a/Test/baseResults/hlsl.string.frag.out b/Test/baseResults/hlsl.string.frag.out index c4a118f..1c6c542 100755 --- a/Test/baseResults/hlsl.string.frag.out +++ b/Test/baseResults/hlsl.string.frag.out @@ -1,5 +1,5 @@ hlsl.string.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main(f1; ( temp float) @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:10 Function Definition: @main(f1; ( temp float) @@ -58,6 +58,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 17 20 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "@main(f1;" Name 9 "f" diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index c23d663..045b8fe 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -1,5 +1,5 @@ hlsl.stringtoken.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:16 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -36,7 +36,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:16 Function Definition: @main( ( temp structure{ temp 4-component vector of float Color}) @@ -78,6 +78,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 25 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index c01e8fa..6798bae 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -3,7 +3,7 @@ WARNING: 0:26: 'register' : ignoring shader_profile WARNING: 0:27: 'register' : ignoring shader_profile WARNING: 0:30: 'register' : ignoring shader_profile -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @PixelShaderFunction(vf4;struct-IN_S-vf4-b1-vf1-vf2-b1-b1-b1-vf41; ( temp 4-component vector of float) @@ -124,7 +124,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:40 Function Definition: @PixelShaderFunction(vf4;struct-IN_S-vf4-b1-vf1-vf2-b1-b1-b1-vf41; ( temp 4-component vector of float) @@ -250,6 +250,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 51 56 79 94 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "IN_S" MemberName 11(IN_S) 0 "a" diff --git a/Test/baseResults/hlsl.struct.split-1.vert.out b/Test/baseResults/hlsl.struct.split-1.vert.out index 9ec01d8..db40682 100644 --- a/Test/baseResults/hlsl.struct.split-1.vert.out +++ b/Test/baseResults/hlsl.struct.split-1.vert.out @@ -1,5 +1,5 @@ hlsl.struct.split-1.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:17 Function Definition: @main(struct-VS_INPUT-i1-vf4-i11;vf4; ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:17 Function Parameters: @@ -103,7 +103,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:17 Function Definition: @main(struct-VS_INPUT-i1-vf4-i11;vf4; ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:17 Function Parameters: @@ -211,6 +211,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 40 44 47 51 61 67 + Source HLSL 500 Name 4 "main" Name 9 "VS_INPUT" MemberName 9(VS_INPUT) 0 "x0_in" diff --git a/Test/baseResults/hlsl.struct.split.array.geom.out b/Test/baseResults/hlsl.struct.split.array.geom.out index e3b0e49..5c36e2b 100644 --- a/Test/baseResults/hlsl.struct.split.array.geom.out +++ b/Test/baseResults/hlsl.struct.split.array.geom.out @@ -1,5 +1,5 @@ hlsl.struct.split.array.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 4 input primitive = points @@ -78,7 +78,7 @@ output primitive = triangle_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 4 input primitive = points @@ -165,6 +165,7 @@ output primitive = triangle_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputTriangleStrip ExecutionMode 4 OutputVertices 4 + Source HLSL 500 Name 4 "main" Name 14 "PSInput" MemberName 14(PSInput) 0 "Pos" diff --git a/Test/baseResults/hlsl.struct.split.assign.frag.out b/Test/baseResults/hlsl.struct.split.assign.frag.out index ad185ee..2228a8a 100644 --- a/Test/baseResults/hlsl.struct.split.assign.frag.out +++ b/Test/baseResults/hlsl.struct.split.assign.frag.out @@ -1,5 +1,5 @@ hlsl.struct.split.assign.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @main(i1;struct-S-f1-vf41[3]; ( temp 4-component vector of float) @@ -118,7 +118,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:7 Function Definition: @main(i1;struct-S-f1-vf41[3]; ( temp 4-component vector of float) @@ -242,6 +242,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 32 39 48 67 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "S" MemberName 10(S) 0 "f" diff --git a/Test/baseResults/hlsl.struct.split.call.vert.out b/Test/baseResults/hlsl.struct.split.call.vert.out index 9dc7b85..647f9b4 100644 --- a/Test/baseResults/hlsl.struct.split.call.vert.out +++ b/Test/baseResults/hlsl.struct.split.call.vert.out @@ -1,5 +1,5 @@ hlsl.struct.split.call.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:17 Function Definition: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; ( temp void) 0:17 Function Parameters: @@ -112,7 +112,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:17 Function Definition: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; ( temp void) 0:17 Function Parameters: @@ -229,6 +229,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 52 56 59 68 74 + Source HLSL 500 Name 4 "main" Name 9 "VS_INPUT" MemberName 9(VS_INPUT) 0 "x0_in" diff --git a/Test/baseResults/hlsl.struct.split.nested.geom.out b/Test/baseResults/hlsl.struct.split.nested.geom.out index beb9773..2f010f5 100644 --- a/Test/baseResults/hlsl.struct.split.nested.geom.out +++ b/Test/baseResults/hlsl.struct.split.nested.geom.out @@ -1,5 +1,5 @@ hlsl.struct.split.nested.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 3 input primitive = triangles @@ -166,7 +166,7 @@ output primitive = triangle_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 3 input primitive = triangles @@ -341,6 +341,7 @@ output primitive = triangle_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputTriangleStrip ExecutionMode 4 OutputVertices 3 + Source HLSL 500 Name 4 "main" Name 9 "PS_IN" MemberName 9(PS_IN) 0 "pos" diff --git a/Test/baseResults/hlsl.struct.split.trivial.geom.out b/Test/baseResults/hlsl.struct.split.trivial.geom.out index da636b3..c552675 100644 --- a/Test/baseResults/hlsl.struct.split.trivial.geom.out +++ b/Test/baseResults/hlsl.struct.split.trivial.geom.out @@ -1,5 +1,5 @@ hlsl.struct.split.trivial.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 3 input primitive = triangles @@ -97,7 +97,7 @@ output primitive = triangle_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 3 input primitive = triangles @@ -203,6 +203,7 @@ output primitive = triangle_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputTriangleStrip ExecutionMode 4 OutputVertices 3 + Source HLSL 500 Name 4 "main" Name 8 "PS_IN" MemberName 8(PS_IN) 0 "pos" diff --git a/Test/baseResults/hlsl.struct.split.trivial.vert.out b/Test/baseResults/hlsl.struct.split.trivial.vert.out index 822f819..05dcb26 100644 --- a/Test/baseResults/hlsl.struct.split.trivial.vert.out +++ b/Test/baseResults/hlsl.struct.split.trivial.vert.out @@ -1,5 +1,5 @@ hlsl.struct.split.trivial.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:16 Function Definition: @main(struct-VS_INPUT-vf41;vf4; ( temp structure{ temp 4-component vector of float Pos}) 0:16 Function Parameters: @@ -50,7 +50,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:16 Function Definition: @main(struct-VS_INPUT-vf41;vf4; ( temp structure{ temp 4-component vector of float Pos}) 0:16 Function Parameters: @@ -105,6 +105,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 31 35 38 47 + Source HLSL 500 Name 4 "main" Name 8 "VS_INPUT" MemberName 8(VS_INPUT) 0 "Pos_in" diff --git a/Test/baseResults/hlsl.structIoFourWay.frag.out b/Test/baseResults/hlsl.structIoFourWay.frag.out index 64c60ed..cb26bb0 100755 --- a/Test/baseResults/hlsl.structIoFourWay.frag.out +++ b/Test/baseResults/hlsl.structIoFourWay.frag.out @@ -1,5 +1,5 @@ hlsl.structIoFourWay.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_greater 0:? Sequence @@ -57,7 +57,7 @@ using depth_greater Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left using depth_greater 0:? Sequence @@ -121,6 +121,7 @@ using depth_greater EntryPoint Fragment 4 "main" 21 43 46 49 53 ExecutionMode 4 OriginUpperLeft ExecutionMode 4 DepthGreater + Source HLSL 500 Name 4 "main" Name 8 "T" MemberName 8(T) 0 "f" diff --git a/Test/baseResults/hlsl.structStructName.frag.out b/Test/baseResults/hlsl.structStructName.frag.out index 0fc4032..3b28805 100755 --- a/Test/baseResults/hlsl.structStructName.frag.out +++ b/Test/baseResults/hlsl.structStructName.frag.out @@ -1,5 +1,5 @@ hlsl.structStructName.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp int) @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: @main( ( temp int) @@ -52,6 +52,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 20 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "@main(" Name 10 "S" diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out index 7c84d37..d70af80 100644 --- a/Test/baseResults/hlsl.structarray.flatten.frag.out +++ b/Test/baseResults/hlsl.structarray.flatten.frag.out @@ -1,5 +1,5 @@ hlsl.structarray.flatten.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:23 Function Definition: @main(struct-PS_OUTPUT-vf41; ( temp void) @@ -64,7 +64,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:23 Function Definition: @main(struct-PS_OUTPUT-vf41; ( temp void) @@ -135,6 +135,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 51 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "color" diff --git a/Test/baseResults/hlsl.structarray.flatten.geom.out b/Test/baseResults/hlsl.structarray.flatten.geom.out index 56aa2a5..702f06e 100644 --- a/Test/baseResults/hlsl.structarray.flatten.geom.out +++ b/Test/baseResults/hlsl.structarray.flatten.geom.out @@ -1,5 +1,5 @@ hlsl.structarray.flatten.geom -Shader version: 450 +Shader version: 500 invocations = -1 max_vertices = 4 input primitive = lines @@ -90,7 +90,7 @@ output primitive = triangle_strip Linked geometry stage: -Shader version: 450 +Shader version: 500 invocations = 1 max_vertices = 4 input primitive = lines @@ -189,6 +189,7 @@ output primitive = triangle_strip ExecutionMode 4 Invocations 1 ExecutionMode 4 OutputTriangleStrip ExecutionMode 4 OutputVertices 4 + Source HLSL 500 Name 4 "main" Name 9 "VertexData" MemberName 9(VertexData) 0 "position" diff --git a/Test/baseResults/hlsl.structbuffer.atomics.frag.out b/Test/baseResults/hlsl.structbuffer.atomics.frag.out index a463a88..c3a3f87 100644 --- a/Test/baseResults/hlsl.structbuffer.atomics.frag.out +++ b/Test/baseResults/hlsl.structbuffer.atomics.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.atomics.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -238,7 +238,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -482,6 +482,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 80 83 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structbuffer.byte.frag.out b/Test/baseResults/hlsl.structbuffer.byte.frag.out index f388f87..6541946 100644 --- a/Test/baseResults/hlsl.structbuffer.byte.frag.out +++ b/Test/baseResults/hlsl.structbuffer.byte.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.byte.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -163,7 +163,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -332,6 +332,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 107 110 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structbuffer.coherent.frag.out b/Test/baseResults/hlsl.structbuffer.coherent.frag.out index f5210c0..fab95f7 100644 --- a/Test/baseResults/hlsl.structbuffer.coherent.frag.out +++ b/Test/baseResults/hlsl.structbuffer.coherent.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.coherent.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -89,7 +89,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -184,6 +184,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 71 74 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structbuffer.fn.frag.out b/Test/baseResults/hlsl.structbuffer.fn.frag.out index 8ed27f6..762ea80 100644 --- a/Test/baseResults/hlsl.structbuffer.fn.frag.out +++ b/Test/baseResults/hlsl.structbuffer.fn.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.fn.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: get(block--vu4[0]1;u1; ( temp 4-component vector of uint) @@ -67,7 +67,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: get(block--vu4[0]1;u1; ( temp 4-component vector of uint) @@ -140,6 +140,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 59 62 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "" MemberName 9 0 "@data" diff --git a/Test/baseResults/hlsl.structbuffer.frag.out b/Test/baseResults/hlsl.structbuffer.frag.out index 3c8b114..634c1b8 100644 --- a/Test/baseResults/hlsl.structbuffer.frag.out +++ b/Test/baseResults/hlsl.structbuffer.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -196,6 +196,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 87 90 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structbuffer.rw.frag.out b/Test/baseResults/hlsl.structbuffer.rw.frag.out index bfe4c39..b1bba58 100644 --- a/Test/baseResults/hlsl.structbuffer.rw.frag.out +++ b/Test/baseResults/hlsl.structbuffer.rw.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.rw.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -89,7 +89,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -184,6 +184,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 71 74 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out index e99bc43..14c2eb6 100644 --- a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out +++ b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out @@ -1,5 +1,5 @@ hlsl.structbuffer.rwbyte.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -504,7 +504,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:5 Function Definition: @main(u1; ( temp 4-component vector of float) @@ -1014,6 +1014,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 233 236 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 12 "@main(u1;" Name 11 "pos" diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out index c621941..8378de2 100755 --- a/Test/baseResults/hlsl.structin.vert.out +++ b/Test/baseResults/hlsl.structin.vert.out @@ -1,5 +1,5 @@ hlsl.structin.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:8 Function Definition: @main(vf4;struct-VI-vf4[2]-vu2-vf41;vf4; ( temp structure{ temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord, temp 4-component vector of float b}) 0:8 Function Parameters: @@ -132,7 +132,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:8 Function Definition: @main(vf4;struct-VI-vf4[2]-vu2-vf41;vf4; ( temp structure{ temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord, temp 4-component vector of float b}) 0:8 Function Parameters: @@ -269,6 +269,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 48 51 54 58 62 66 78 + Source HLSL 500 Name 4 "main" Name 13 "VI" MemberName 13(VI) 0 "m" diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out index 8ee9d7c..c77da93 100755 --- a/Test/baseResults/hlsl.switch.frag.out +++ b/Test/baseResults/hlsl.switch.frag.out @@ -1,5 +1,5 @@ hlsl.switch.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4;i1;i1; ( temp 4-component vector of float) @@ -149,7 +149,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4;i1;i1; ( temp 4-component vector of float) @@ -304,6 +304,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 88 92 95 98 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 15 "@PixelShaderFunction(vf4;i1;i1;" Name 12 "input" diff --git a/Test/baseResults/hlsl.swizzle.frag.out b/Test/baseResults/hlsl.swizzle.frag.out index 4674b76..59b432b 100755 --- a/Test/baseResults/hlsl.swizzle.frag.out +++ b/Test/baseResults/hlsl.swizzle.frag.out @@ -1,5 +1,5 @@ hlsl.swizzle.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -40,7 +40,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -85,6 +85,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "ShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/hlsl.templatetypes.frag.out b/Test/baseResults/hlsl.templatetypes.frag.out index 11ea394..9d0cced 100644 --- a/Test/baseResults/hlsl.templatetypes.frag.out +++ b/Test/baseResults/hlsl.templatetypes.frag.out @@ -1,5 +1,5 @@ hlsl.templatetypes.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @PixelShaderFunction( ( temp float) @@ -255,7 +255,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @PixelShaderFunction( ( temp float) @@ -517,6 +517,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 151 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 8 "@PixelShaderFunction(" Name 12 "r00" diff --git a/Test/baseResults/hlsl.this.frag.out b/Test/baseResults/hlsl.this.frag.out index 8619468..b35e267 100755 --- a/Test/baseResults/hlsl.this.frag.out +++ b/Test/baseResults/hlsl.this.frag.out @@ -1,5 +1,5 @@ hlsl.this.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -121,7 +121,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Sequence @@ -248,6 +248,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 96 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "type1" MemberName 9(type1) 0 "bar" diff --git a/Test/baseResults/hlsl.tx.bracket.frag.out b/Test/baseResults/hlsl.tx.bracket.frag.out index 9e1db24..12d5f17 100644 --- a/Test/baseResults/hlsl.tx.bracket.frag.out +++ b/Test/baseResults/hlsl.tx.bracket.frag.out @@ -1,5 +1,5 @@ hlsl.tx.bracket.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: Fn1(vi4; ( temp 4-component vector of int) @@ -212,7 +212,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:38 Function Definition: Fn1(vi4; ( temp 4-component vector of int) @@ -431,6 +431,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 164 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "Fn1(vi4;" Name 10 "x" diff --git a/Test/baseResults/hlsl.type.half.frag.out b/Test/baseResults/hlsl.type.half.frag.out index 104c739..889d79b 100644 --- a/Test/baseResults/hlsl.type.half.frag.out +++ b/Test/baseResults/hlsl.type.half.frag.out @@ -1,5 +1,5 @@ hlsl.type.half.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main( ( temp 4-component vector of float) @@ -55,7 +55,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:3 Function Definition: @main( ( temp 4-component vector of float) @@ -116,6 +116,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 34 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 9 "@main(" Name 12 "h0" diff --git a/Test/baseResults/hlsl.type.identifier.frag.out b/Test/baseResults/hlsl.type.identifier.frag.out index e8a763c..1977340 100644 --- a/Test/baseResults/hlsl.type.identifier.frag.out +++ b/Test/baseResults/hlsl.type.identifier.frag.out @@ -1,5 +1,5 @@ hlsl.type.identifier.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:6 Function Definition: fn(f1; ( temp float) @@ -115,7 +115,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:6 Function Definition: fn(f1; ( temp float) @@ -236,6 +236,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 95 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 10 "fn(f1;" Name 9 "float" diff --git a/Test/baseResults/hlsl.typeGraphCopy.vert.out b/Test/baseResults/hlsl.typeGraphCopy.vert.out index 7d55c44..217e7ec 100755 --- a/Test/baseResults/hlsl.typeGraphCopy.vert.out +++ b/Test/baseResults/hlsl.typeGraphCopy.vert.out @@ -1,5 +1,5 @@ hlsl.typeGraphCopy.vert -Shader version: 450 +Shader version: 500 0:? Sequence 0:22 Function Definition: @main( ( temp float) 0:22 Function Parameters: @@ -32,7 +32,7 @@ Shader version: 450 Linked vertex stage: -Shader version: 450 +Shader version: 500 0:? Sequence 0:22 Function Definition: @main( ( temp float) 0:22 Function Parameters: @@ -69,6 +69,7 @@ Shader version: 450 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 EntryPoint Vertex 4 "main" 26 + Source HLSL 500 Name 4 "main" Name 8 "@main(" Name 11 "N1" diff --git a/Test/baseResults/hlsl.typedef.frag.out b/Test/baseResults/hlsl.typedef.frag.out index 6edb191..1c1a351 100755 --- a/Test/baseResults/hlsl.typedef.frag.out +++ b/Test/baseResults/hlsl.typedef.frag.out @@ -1,5 +1,5 @@ hlsl.typedef.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: ShaderFunction(vf4;i1; ( temp 4-component vector of float) @@ -41,7 +41,7 @@ Linked fragment stage: WARNING: Linking fragment stage: Entry point not found -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:4 Function Definition: ShaderFunction(vf4;i1; ( temp 4-component vector of float) @@ -87,6 +87,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 14 "ShaderFunction(vf4;i1;" Name 12 "input" diff --git a/Test/baseResults/hlsl.void.frag.out b/Test/baseResults/hlsl.void.frag.out index 584f378..1df35a6 100755 --- a/Test/baseResults/hlsl.void.frag.out +++ b/Test/baseResults/hlsl.void.frag.out @@ -1,5 +1,5 @@ hlsl.void.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Function Definition: foo1( ( temp void) @@ -28,7 +28,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:1 Function Definition: foo1( ( temp void) @@ -62,6 +62,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 22 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 6 "foo1(" Name 8 "foo2(" diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out index 2f68da1..cd47dc7 100755 --- a/Test/baseResults/hlsl.whileLoop.frag.out +++ b/Test/baseResults/hlsl.whileLoop.frag.out @@ -1,5 +1,5 @@ hlsl.whileLoop.frag -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -49,7 +49,7 @@ gl_FragCoord origin is upper left Linked fragment stage: -Shader version: 450 +Shader version: 500 gl_FragCoord origin is upper left 0:? Sequence 0:2 Function Definition: @PixelShaderFunction(vf4; ( temp 4-component vector of float) @@ -104,6 +104,7 @@ gl_FragCoord origin is upper left MemoryModel Logical GLSL450 EntryPoint Fragment 4 "PixelShaderFunction" 45 48 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "PixelShaderFunction" Name 11 "@PixelShaderFunction(vf4;" Name 10 "input" diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index 5af75db..af309a1 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out @@ -11,6 +11,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 188 192 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out index c5d8a01..dd2917e 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out @@ -9,6 +9,7 @@ remap.hlsl.templatetypes.none.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 153 156 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "@main(vf4;" Name 10 "input" diff --git a/Test/baseResults/spv.buffer.autoassign.frag.out b/Test/baseResults/spv.buffer.autoassign.frag.out index 8fb6215..2a316ee 100644 --- a/Test/baseResults/spv.buffer.autoassign.frag.out +++ b/Test/baseResults/spv.buffer.autoassign.frag.out @@ -8,6 +8,7 @@ spv.buffer.autoassign.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 47 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/spv.register.autoassign-2.frag.out b/Test/baseResults/spv.register.autoassign-2.frag.out index c8273dd..f09a468 100644 --- a/Test/baseResults/spv.register.autoassign-2.frag.out +++ b/Test/baseResults/spv.register.autoassign-2.frag.out @@ -8,6 +8,7 @@ spv.register.autoassign-2.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 44 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/spv.register.autoassign.frag.out b/Test/baseResults/spv.register.autoassign.frag.out index ae048ce..4874d90 100644 --- a/Test/baseResults/spv.register.autoassign.frag.out +++ b/Test/baseResults/spv.register.autoassign.frag.out @@ -9,6 +9,7 @@ spv.register.autoassign.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main_ep" 151 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main_ep" Name 9 "Func1(" Name 11 "Func2(" diff --git a/Test/baseResults/spv.register.noautoassign.frag.out b/Test/baseResults/spv.register.noautoassign.frag.out index afadc48..71c0b37 100644 --- a/Test/baseResults/spv.register.noautoassign.frag.out +++ b/Test/baseResults/spv.register.noautoassign.frag.out @@ -9,6 +9,7 @@ spv.register.noautoassign.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main_ep" 151 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main_ep" Name 9 "Func1(" Name 11 "Func2(" diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out index e2b544a..9069666 100644 --- a/Test/baseResults/spv.rw.autoassign.frag.out +++ b/Test/baseResults/spv.rw.autoassign.frag.out @@ -10,6 +10,7 @@ spv.rw.autoassign.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 39 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" diff --git a/Test/baseResults/spv.ssbo.autoassign.frag.out b/Test/baseResults/spv.ssbo.autoassign.frag.out index 8d10b6b..7ec2a30 100644 --- a/Test/baseResults/spv.ssbo.autoassign.frag.out +++ b/Test/baseResults/spv.ssbo.autoassign.frag.out @@ -8,6 +8,7 @@ spv.ssbo.autoassign.frag MemoryModel Logical GLSL450 EntryPoint Fragment 4 "main" 88 91 ExecutionMode 4 OriginUpperLeft + Source HLSL 500 Name 4 "main" Name 11 "@main(vf4;" Name 10 "pos" diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 036b2d7..31b5fee 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1981" -#define GLSLANG_DATE "06-Apr-2017" +#define GLSLANG_REVISION "Overload400-PrecQual.1985" +#define GLSLANG_DATE "07-Apr-2017" diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index 52192d4..85c0151 100644 --- a/glslang/MachineIndependent/Intermediate.cpp +++ b/glslang/MachineIndependent/Intermediate.cpp @@ -920,7 +920,7 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat case EbtUint: switch (from) { case EbtInt: - return version >= 400; + return version >= 400 || (source == EShSourceHlsl); case EbtUint: return true; case EbtBool: diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp index 8b3a306..f61439f 100644 --- a/glslang/MachineIndependent/Scan.cpp +++ b/glslang/MachineIndependent/Scan.cpp @@ -175,7 +175,7 @@ bool TInputScanner::scanVersion(int& version, EProfile& profile, bool& notFirstT bool versionNotFirst = false; // means not first WRT comments and white space, nothing more notFirstToken = false; // means not first WRT to real tokens - version = 0; // means not found + version = 0; // means not found profile = ENoProfile; bool foundNonSpaceTab = false; diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index f7596d9..14f2bde 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -442,7 +442,7 @@ bool DeduceVersionProfile(TInfoSink& infoSink, EShLanguage stage, bool versionNo bool correct = true; if (source == EShSourceHlsl) { - version = 450; // TODO: GLSL parser is still used for builtins. + version = 500; // shader model; currently a characteristic of glslang, not the input profile = ECoreProfile; // allow doubles in prototype parsing return correct; } @@ -679,13 +679,13 @@ bool ProcessDeferred( // First, without using the preprocessor or parser, find the #version, so we know what // symbol tables, processing rules, etc. to set up. This does not need the extra strings // outlined above, just the user shader. - int version; - EProfile profile; glslang::TInputScanner userInput(numStrings, &strings[numPre], &lengths[numPre]); // no preamble - bool versionNotFirstToken; - bool versionNotFirst = userInput.scanVersion(version, profile, versionNotFirstToken); + int version = 0; + EProfile profile = ENoProfile; + bool versionNotFirstToken = false; + bool versionNotFirst = (messages & EShMsgReadHlsl) ? true : userInput.scanVersion(version, profile, versionNotFirstToken); bool versionNotFound = version == 0; - if (forceDefaultVersionAndProfile) { + if (forceDefaultVersionAndProfile && (messages & EShMsgReadHlsl) == 0) { if (! (messages & EShMsgSuppressWarnings) && ! versionNotFound && (version != defaultVersion || profile != defaultProfile)) { compiler->infoSink.info << "Warning, (version, profile) forced to be (" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index ca0d7b7..745ee40 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -6424,7 +6424,7 @@ TIntermNode* HlslParseContext::executeInitializer(const TSourceLoc& loc, TInterm return nullptr; } - // Const variables require a constant initializer, depending on version + // Const variables require a constant initializer if (qualifier == EvqConst) { if (initializer->getType().getQualifier().storage != EvqConst) { variable->getWritableType().getQualifier().storage = EvqConstReadOnly; diff --git a/hlsl/hlslScanContext.cpp b/hlsl/hlslScanContext.cpp index 6ddb39d..55304a0 100755 --- a/hlsl/hlslScanContext.cpp +++ b/hlsl/hlslScanContext.cpp @@ -878,28 +878,4 @@ EHlslTokenClass HlslScanContext::reservedWord() return EHTokNone; } -EHlslTokenClass HlslScanContext::identifierOrReserved(bool reserved) -{ - if (reserved) { - reservedWord(); - - return EHTokNone; - } - - if (parseContext.forwardCompatible) - parseContext.warn(loc, "using future reserved keyword", tokenText, ""); - - return identifierOrType(); -} - -// For a keyword that was never reserved, until it suddenly -// showed up. -EHlslTokenClass HlslScanContext::nonreservedKeyword(int version) -{ - if (parseContext.version < version) - return identifierOrType(); - - return keyword; -} - } // end namespace glslang