From a08c929d8e512c63edb86be4ee247a3ee92a23b0 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sat, 1 Oct 2016 17:17:55 -0600 Subject: [PATCH] HLSL: Line numbers only: Set locations (line numbers) on synthesized flattening code. --- Test/baseResults/hlsl.array.flatten.frag.out | 152 +++++++++--------- .../hlsl.calculatelod.dx10.frag.out | 8 +- .../hlsl.calculatelodunclamped.dx10.frag.out | 8 +- Test/baseResults/hlsl.constructexpr.frag.out | 8 +- Test/baseResults/hlsl.entry-in.frag.out | 76 ++++----- Test/baseResults/hlsl.entry-out.frag.out | 4 +- .../hlsl.gather.array.dx10.frag.out | 8 +- .../hlsl.gather.basic.dx10.frag.out | 8 +- .../hlsl.gather.basic.dx10.vert.out | 8 +- .../hlsl.gather.offset.dx10.frag.out | 8 +- .../hlsl.gather.offsetarray.dx10.frag.out | 8 +- .../hlsl.gatherRGBA.array.dx10.frag.out | 8 +- .../hlsl.gatherRGBA.basic.dx10.frag.out | 8 +- .../hlsl.gatherRGBA.offset.dx10.frag.out | 8 +- .../hlsl.gatherRGBA.offsetarray.dx10.frag.out | 8 +- .../hlsl.getdimensions.dx10.frag.out | 8 +- .../hlsl.getdimensions.dx10.vert.out | 8 +- .../hlsl.getsampleposition.dx10.frag.out | 8 +- Test/baseResults/hlsl.init2.frag.out | 8 +- Test/baseResults/hlsl.inoutquals.frag.out | 8 +- Test/baseResults/hlsl.intrinsics.frag.out | 8 +- Test/baseResults/hlsl.load.2dms.dx10.frag.out | 8 +- .../baseResults/hlsl.load.array.dx10.frag.out | 8 +- .../baseResults/hlsl.load.basic.dx10.frag.out | 8 +- .../baseResults/hlsl.load.basic.dx10.vert.out | 8 +- .../hlsl.load.buffer.dx10.frag.out | 8 +- .../hlsl.load.offset.dx10.frag.out | 8 +- .../hlsl.load.offsetarray.dx10.frag.out | 8 +- Test/baseResults/hlsl.matrixindex.frag.out | 8 +- .../baseResults/hlsl.numericsuffixes.frag.out | 8 +- Test/baseResults/hlsl.pp.line.frag.out | 8 +- Test/baseResults/hlsl.precise.frag.out | 8 +- Test/baseResults/hlsl.promotions.frag.out | 8 +- .../hlsl.sample.array.dx10.frag.out | 8 +- .../hlsl.sample.basic.dx10.frag.out | 8 +- .../hlsl.sample.offset.dx10.frag.out | 8 +- .../hlsl.sample.offsetarray.dx10.frag.out | 8 +- .../hlsl.samplebias.array.dx10.frag.out | 8 +- .../hlsl.samplebias.basic.dx10.frag.out | 8 +- .../hlsl.samplebias.offset.dx10.frag.out | 8 +- .../hlsl.samplebias.offsetarray.dx10.frag.out | 8 +- .../hlsl.samplecmp.array.dx10.frag.out | 8 +- .../hlsl.samplecmp.basic.dx10.frag.out | 8 +- .../hlsl.samplecmp.offset.dx10.frag.out | 8 +- .../hlsl.samplecmp.offsetarray.dx10.frag.out | 8 +- ...lsl.samplecmplevelzero.array.dx10.frag.out | 8 +- ...lsl.samplecmplevelzero.basic.dx10.frag.out | 8 +- ...sl.samplecmplevelzero.offset.dx10.frag.out | 8 +- ...mplecmplevelzero.offsetarray.dx10.frag.out | 8 +- .../hlsl.samplegrad.array.dx10.frag.out | 8 +- .../hlsl.samplegrad.basic.dx10.frag.out | 8 +- .../hlsl.samplegrad.basic.dx10.vert.out | 8 +- .../hlsl.samplegrad.offset.dx10.frag.out | 8 +- .../hlsl.samplegrad.offsetarray.dx10.frag.out | 8 +- .../hlsl.samplelevel.array.dx10.frag.out | 8 +- .../hlsl.samplelevel.basic.dx10.frag.out | 8 +- .../hlsl.samplelevel.basic.dx10.vert.out | 8 +- .../hlsl.samplelevel.offset.dx10.frag.out | 8 +- ...hlsl.samplelevel.offsetarray.dx10.frag.out | 8 +- Test/baseResults/hlsl.semicolons.frag.out | 8 +- Test/baseResults/hlsl.stringtoken.frag.out | 8 +- Test/baseResults/hlsl.structin.vert.out | 8 +- glslang/Include/revision.h | 2 +- hlsl/hlslParseHelper.cpp | 13 +- 64 files changed, 359 insertions(+), 360 deletions(-) diff --git a/Test/baseResults/hlsl.array.flatten.frag.out b/Test/baseResults/hlsl.array.flatten.frag.out index e7487598..185c2cc6 100644 --- a/Test/baseResults/hlsl.array.flatten.frag.out +++ b/Test/baseResults/hlsl.array.flatten.frag.out @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:31 'ps_output' (out structure{temp 4-component vector of float color}) 0:? Sequence 0:33 Sequence -0:? Sequence +0:33 Sequence 0:33 move second child to first child (temp sampler) 0:33 direct index (temp sampler) 0:33 'local_sampler_array' (temp 3-element array of sampler) @@ -64,7 +64,7 @@ gl_FragCoord origin is upper left 0:33 2 (const int) 0:? 'g_samp[2]' (uniform sampler) 0:34 Sequence -0:? Sequence +0:34 Sequence 0:34 move second child to first child (temp texture1D) 0:34 direct index (temp texture1D) 0:34 'local_texture_array' (temp 3-element array of texture1D) @@ -95,48 +95,48 @@ gl_FragCoord origin is upper left 0:37 add (temp 4-component vector of float) 0:37 Function Call: TestFn1( (temp 4-component vector of float) 0:37 Function Call: TestFn2(t11[3];p1[3]; (temp 4-component vector of float) -0:? Comma (temp 3-element array of texture1D) -0:? Sequence -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 0 (const int) +0:37 Comma (temp 3-element array of texture1D) +0:37 Sequence +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 0 (const int) 0:? 'g_tex[0]' (uniform texture1D) -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 1 (const int) +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 1 (const int) 0:? 'g_tex[1]' (uniform texture1D) -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 2 (const int) +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 2 (const int) 0:? 'g_tex[2]' (uniform texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Comma (temp 3-element array of sampler) -0:? Sequence -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 0 (const int) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Comma (temp 3-element array of sampler) +0:37 Sequence +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 0 (const int) 0:? 'g_samp[0]' (uniform sampler) -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 1 (const int) +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 1 (const int) 0:? 'g_samp[1]' (uniform sampler) -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 2 (const int) +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 2 (const int) 0:? 'g_samp[2]' (uniform sampler) -0:? 'aggShadow' (temp 3-element array of sampler) +0:37 'aggShadow' (temp 3-element array of sampler) 0:? Linker Objects 0:? 'g_tex[0]' (uniform texture1D) 0:? 'g_tex[1]' (uniform texture1D) @@ -203,7 +203,7 @@ gl_FragCoord origin is upper left 0:31 'ps_output' (out structure{temp 4-component vector of float color}) 0:? Sequence 0:33 Sequence -0:? Sequence +0:33 Sequence 0:33 move second child to first child (temp sampler) 0:33 direct index (temp sampler) 0:33 'local_sampler_array' (temp 3-element array of sampler) @@ -223,7 +223,7 @@ gl_FragCoord origin is upper left 0:33 2 (const int) 0:? 'g_samp[2]' (uniform sampler) 0:34 Sequence -0:? Sequence +0:34 Sequence 0:34 move second child to first child (temp texture1D) 0:34 direct index (temp texture1D) 0:34 'local_texture_array' (temp 3-element array of texture1D) @@ -254,48 +254,48 @@ gl_FragCoord origin is upper left 0:37 add (temp 4-component vector of float) 0:37 Function Call: TestFn1( (temp 4-component vector of float) 0:37 Function Call: TestFn2(t11[3];p1[3]; (temp 4-component vector of float) -0:? Comma (temp 3-element array of texture1D) -0:? Sequence -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 0 (const int) +0:37 Comma (temp 3-element array of texture1D) +0:37 Sequence +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 0 (const int) 0:? 'g_tex[0]' (uniform texture1D) -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 1 (const int) +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 1 (const int) 0:? 'g_tex[1]' (uniform texture1D) -0:? move second child to first child (temp texture1D) -0:? direct index (temp texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Constant: -0:? 2 (const int) +0:37 move second child to first child (temp texture1D) +0:37 direct index (temp texture1D) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Constant: +0:37 2 (const int) 0:? 'g_tex[2]' (uniform texture1D) -0:? 'aggShadow' (temp 3-element array of texture1D) -0:? Comma (temp 3-element array of sampler) -0:? Sequence -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 0 (const int) +0:37 'aggShadow' (temp 3-element array of texture1D) +0:37 Comma (temp 3-element array of sampler) +0:37 Sequence +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 0 (const int) 0:? 'g_samp[0]' (uniform sampler) -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 1 (const int) +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 1 (const int) 0:? 'g_samp[1]' (uniform sampler) -0:? move second child to first child (temp sampler) -0:? direct index (temp sampler) -0:? 'aggShadow' (temp 3-element array of sampler) -0:? Constant: -0:? 2 (const int) +0:37 move second child to first child (temp sampler) +0:37 direct index (temp sampler) +0:37 'aggShadow' (temp 3-element array of sampler) +0:37 Constant: +0:37 2 (const int) 0:? 'g_samp[2]' (uniform sampler) -0:? 'aggShadow' (temp 3-element array of sampler) +0:37 'aggShadow' (temp 3-element array of sampler) 0:? Linker Objects 0:? 'g_tex[0]' (uniform texture1D) 0:? 'g_tex[1]' (uniform texture1D) diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index 30af5920..9d061d29 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) @@ -313,8 +313,8 @@ gl_FragCoord origin is upper left 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index 92d84f92..ecd1f0d1 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -151,8 +151,8 @@ ERROR: node is still EOpNull! 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) @@ -325,8 +325,8 @@ ERROR: node is still EOpNull! 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index 1595a08d..e6ed6e13 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -34,8 +34,8 @@ gl_FragCoord origin is upper left 0:15 1.000000 0:15 1.000000 0:15 1.000000 -0:? Sequence -0:? Sequence +0:16 Sequence +0:16 Sequence 0:16 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:16 color: direct index for structure (temp 4-component vector of float) @@ -85,8 +85,8 @@ gl_FragCoord origin is upper left 0:15 1.000000 0:15 1.000000 0:15 1.000000 -0:? Sequence -0:? Sequence +0:16 Sequence +0:16 Sequence 0:16 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:16 color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.entry-in.frag.out b/Test/baseResults/hlsl.entry-in.frag.out index b2ab8cbe..04e3935d 100755 --- a/Test/baseResults/hlsl.entry-in.frag.out +++ b/Test/baseResults/hlsl.entry-in.frag.out @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left 0:13 Function Parameters: 0:13 'i' (in structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:? Sequence -0:? Sequence +0:15 Sequence 0:15 move second child to first child (temp 2-component vector of float) 0:15 v: direct index for structure (temp 2-component vector of float) 0:15 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) @@ -54,27 +54,27 @@ gl_FragCoord origin is upper left 0:17 move second child to first child (temp float) 0:17 'ret2' (temp float) 0:17 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float) -0:? Comma (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Sequence -0:? move second child to first child (temp 2-component vector of float) -0:? v: direct index for structure (temp 2-component vector of float) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 0 (const int) +0:17 Comma (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Sequence +0:17 move second child to first child (temp 2-component vector of float) +0:17 v: direct index for structure (temp 2-component vector of float) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 0 (const int) 0:? 'v' (layout(location=0 ) in 2-component vector of float) -0:? move second child to first child (temp 4-component vector of float) -0:? fragCoord: direct index for structure (temp 4-component vector of float) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 1 (const int) +0:17 move second child to first child (temp 4-component vector of float) +0:17 fragCoord: direct index for structure (temp 4-component vector of float) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 1 (const int) 0:? 'fragCoord' (in 4-component vector of float FragCoord) -0:? move second child to first child (temp 2-component vector of int) -0:? i2: direct index for structure (temp 2-component vector of int) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 2 (const int) +0:17 move second child to first child (temp 2-component vector of int) +0:17 i2: direct index for structure (temp 2-component vector of int) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 2 (const int) 0:? 'i2' (layout(location=1 ) in 2-component vector of int) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) @@ -124,7 +124,7 @@ gl_FragCoord origin is upper left 0:13 Function Parameters: 0:13 'i' (in structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:? Sequence -0:? Sequence +0:15 Sequence 0:15 move second child to first child (temp 2-component vector of float) 0:15 v: direct index for structure (temp 2-component vector of float) 0:15 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) @@ -152,27 +152,27 @@ gl_FragCoord origin is upper left 0:17 move second child to first child (temp float) 0:17 'ret2' (temp float) 0:17 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float) -0:? Comma (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Sequence -0:? move second child to first child (temp 2-component vector of float) -0:? v: direct index for structure (temp 2-component vector of float) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 0 (const int) +0:17 Comma (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Sequence +0:17 move second child to first child (temp 2-component vector of float) +0:17 v: direct index for structure (temp 2-component vector of float) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 0 (const int) 0:? 'v' (layout(location=0 ) in 2-component vector of float) -0:? move second child to first child (temp 4-component vector of float) -0:? fragCoord: direct index for structure (temp 4-component vector of float) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 1 (const int) +0:17 move second child to first child (temp 4-component vector of float) +0:17 fragCoord: direct index for structure (temp 4-component vector of float) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 1 (const int) 0:? 'fragCoord' (in 4-component vector of float FragCoord) -0:? move second child to first child (temp 2-component vector of int) -0:? i2: direct index for structure (temp 2-component vector of int) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) -0:? Constant: -0:? 2 (const int) +0:17 move second child to first child (temp 2-component vector of int) +0:17 i2: direct index for structure (temp 2-component vector of int) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 Constant: +0:17 2 (const int) 0:? 'i2' (layout(location=1 ) in 2-component vector of int) -0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) +0:17 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index ad7518e3..86fde14c 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -61,7 +61,7 @@ gl_FragCoord origin is upper left 0:20 Comma (temp void) 0:20 Function Call: fun(struct-OutParam-vf2-vi21; (temp void) 0:20 'tempArg' (temp structure{temp 2-component vector of float v, temp 2-component vector of int i}) -0:? Sequence +0:20 Sequence 0:20 move second child to first child (temp 2-component vector of float) 0:? 'v' (layout(location=4 ) out 2-component vector of float) 0:20 v: direct index for structure (temp 2-component vector of float) @@ -154,7 +154,7 @@ gl_FragCoord origin is upper left 0:20 Comma (temp void) 0:20 Function Call: fun(struct-OutParam-vf2-vi21; (temp void) 0:20 'tempArg' (temp structure{temp 2-component vector of float v, temp 2-component vector of int i}) -0:? Sequence +0:20 Sequence 0:20 move second child to first child (temp 2-component vector of float) 0:? 'v' (layout(location=4 ) out 2-component vector of float) 0:20 v: direct index for structure (temp 2-component vector of float) diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index a686c11b..a09b87ce 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -91,8 +91,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) @@ -217,8 +217,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index e28ad34a..467ccf4c 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -85,8 +85,8 @@ gl_FragCoord origin is upper left 0:45 1 (const int) 0:45 Constant: 0:45 1.000000 -0:? Sequence -0:? Sequence +0:47 Sequence +0:47 Sequence 0:47 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:47 Color: direct index for structure (temp 4-component vector of float) @@ -209,8 +209,8 @@ gl_FragCoord origin is upper left 0:45 1 (const int) 0:45 Constant: 0:45 1.000000 -0:? Sequence -0:? Sequence +0:47 Sequence +0:47 Sequence 0:47 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:47 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 92672356..d08a57e7 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -77,8 +77,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:45 Sequence +0:45 Sequence 0:45 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:45 Pos: direct index for structure (temp 4-component vector of float) @@ -186,8 +186,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:45 Sequence +0:45 Sequence 0:45 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:45 Pos: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index 86a201cc..ff7eb398 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -61,8 +61,8 @@ gl_FragCoord origin is upper left 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:41 1 (const int) 0:41 Constant: 0:41 1.000000 -0:? Sequence -0:? Sequence +0:43 Sequence +0:43 Sequence 0:43 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:43 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 2bda352c..dc64a807 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -64,8 +64,8 @@ gl_FragCoord origin is upper left 0:33 1 (const int) 0:33 Constant: 0:33 1.000000 -0:? Sequence -0:? Sequence +0:35 Sequence +0:35 Sequence 0:35 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:35 Color: direct index for structure (temp 4-component vector of float) @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:33 1 (const int) 0:33 Constant: 0:33 1.000000 -0:? Sequence -0:? Sequence +0:35 Sequence +0:35 Sequence 0:35 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:35 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index c9f6bbd7..4e78cdaf 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -334,8 +334,8 @@ gl_FragCoord origin is upper left 0:68 1 (const int) 0:68 Constant: 0:68 1.000000 -0:? Sequence -0:? Sequence +0:70 Sequence +0:70 Sequence 0:70 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:70 Color: direct index for structure (temp 4-component vector of float) @@ -704,8 +704,8 @@ gl_FragCoord origin is upper left 0:68 1 (const int) 0:68 Constant: 0:68 1.000000 -0:? Sequence -0:? Sequence +0:70 Sequence +0:70 Sequence 0:70 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:70 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 5cdf912e..ef1e7e05 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -334,8 +334,8 @@ gl_FragCoord origin is upper left 0:74 1 (const int) 0:74 Constant: 0:74 1.000000 -0:? Sequence -0:? Sequence +0:76 Sequence +0:76 Sequence 0:76 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:76 Color: direct index for structure (temp 4-component vector of float) @@ -708,8 +708,8 @@ gl_FragCoord origin is upper left 0:74 1 (const int) 0:74 Constant: 0:74 1.000000 -0:? Sequence -0:? Sequence +0:76 Sequence +0:76 Sequence 0:76 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:76 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index a04010f3..f178c3b3 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -586,8 +586,8 @@ gl_FragCoord origin is upper left 0:113 1 (const int) 0:113 Constant: 0:113 1.000000 -0:? Sequence -0:? Sequence +0:115 Sequence +0:115 Sequence 0:115 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:115 Color: direct index for structure (temp 4-component vector of float) @@ -1212,8 +1212,8 @@ gl_FragCoord origin is upper left 0:113 1 (const int) 0:113 Constant: 0:113 1.000000 -0:? Sequence -0:? Sequence +0:115 Sequence +0:115 Sequence 0:115 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:115 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 1a5df38e..f565379f 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -586,8 +586,8 @@ gl_FragCoord origin is upper left 0:107 1 (const int) 0:107 Constant: 0:107 1.000000 -0:? Sequence -0:? Sequence +0:109 Sequence +0:109 Sequence 0:109 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:109 Color: direct index for structure (temp 4-component vector of float) @@ -1208,8 +1208,8 @@ gl_FragCoord origin is upper left 0:107 1 (const int) 0:107 Constant: 0:107 1.000000 -0:? Sequence -0:? Sequence +0:109 Sequence +0:109 Sequence 0:109 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:109 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index 8aba16ae..3a55d682 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1060,8 +1060,8 @@ gl_FragCoord origin is upper left 0:277 1 (const int) 0:277 Constant: 0:277 1.000000 -0:? Sequence -0:? Sequence +0:279 Sequence +0:279 Sequence 0:279 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:279 Color: direct index for structure (temp 4-component vector of float) @@ -2172,8 +2172,8 @@ gl_FragCoord origin is upper left 0:277 1 (const int) 0:277 Constant: 0:277 1.000000 -0:? Sequence -0:? Sequence +0:279 Sequence +0:279 Sequence 0:279 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:279 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index 1d72e873..3a05bca8 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -36,8 +36,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:26 Sequence +0:26 Sequence 0:26 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:26 Pos: direct index for structure (temp 4-component vector of float) @@ -91,8 +91,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:26 Sequence +0:26 Sequence 0:26 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:26 Pos: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index 41f6ca2d..9465c62b 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -43,8 +43,8 @@ ERROR: node is still EOpNull! 0:20 1 (const int) 0:20 Constant: 0:20 1.000000 -0:? Sequence -0:? Sequence +0:22 Sequence +0:22 Sequence 0:22 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:22 Color: direct index for structure (temp 4-component vector of float) @@ -108,8 +108,8 @@ ERROR: node is still EOpNull! 0:20 1 (const int) 0:20 Constant: 0:20 1.000000 -0:? Sequence -0:? Sequence +0:22 Sequence +0:22 Sequence 0:22 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:22 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index 9ba8b118..9b53e304 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -43,8 +43,8 @@ gl_FragCoord origin is upper left 0:30 1.000000 0:30 1.000000 0:30 1.000000 -0:? Sequence -0:? Sequence +0:31 Sequence +0:31 Sequence 0:31 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:31 color: direct index for structure (temp 4-component vector of float) @@ -103,8 +103,8 @@ gl_FragCoord origin is upper left 0:30 1.000000 0:30 1.000000 0:30 1.000000 -0:? Sequence -0:? Sequence +0:31 Sequence +0:31 Sequence 0:31 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:31 color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index b3b3d8fd..83fe24bd 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -55,8 +55,8 @@ gl_FragCoord origin is upper left 0:22 'inpos' (noperspective in 4-component vector of float FragCoord) 0:22 Constant: 0:22 3 (const int) -0:? Sequence -0:? Sequence +0:24 Sequence +0:24 Sequence 0:24 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:24 Color: direct index for structure (temp 4-component vector of float) @@ -135,8 +135,8 @@ gl_FragCoord origin is upper left 0:22 'inpos' (noperspective in 4-component vector of float FragCoord) 0:22 Constant: 0:22 3 (const int) -0:? Sequence -0:? Sequence +0:24 Sequence +0:24 Sequence 0:24 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:24 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 09f88a86..4009d8da 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -2772,8 +2772,8 @@ gl_FragCoord origin is upper left 0:491 1.000000 0:491 1.000000 0:491 1.000000 -0:? Sequence -0:? Sequence +0:492 Sequence +0:492 Sequence 0:492 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:492 color: direct index for structure (temp 4-component vector of float) @@ -5573,8 +5573,8 @@ gl_FragCoord origin is upper left 0:491 1.000000 0:491 1.000000 0:491 1.000000 -0:? Sequence -0:? Sequence +0:492 Sequence +0:492 Sequence 0:492 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:492 color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 0048d9ad..77f4fe84 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:52 1 (const int) 0:52 Constant: 0:52 1.000000 -0:? Sequence -0:? Sequence +0:54 Sequence +0:54 Sequence 0:54 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:54 Color: direct index for structure (temp 4-component vector of float) @@ -316,8 +316,8 @@ gl_FragCoord origin is upper left 0:52 1 (const int) 0:52 Constant: 0:52 1.000000 -0:? Sequence -0:? Sequence +0:54 Sequence +0:54 Sequence 0:54 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:54 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index fada58a9..57e479a0 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:68 1 (const int) 0:68 Constant: 0:68 1.000000 -0:? Sequence -0:? Sequence +0:70 Sequence +0:70 Sequence 0:70 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:70 Color: direct index for structure (temp 4-component vector of float) @@ -331,8 +331,8 @@ gl_FragCoord origin is upper left 0:68 1 (const int) 0:68 Constant: 0:68 1.000000 -0:? Sequence -0:? Sequence +0:70 Sequence +0:70 Sequence 0:70 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:70 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 20b7456d..90f7e496 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:73 1 (const int) 0:73 Constant: 0:73 1.000000 -0:? Sequence -0:? Sequence +0:75 Sequence +0:75 Sequence 0:75 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:75 Color: direct index for structure (temp 4-component vector of float) @@ -433,8 +433,8 @@ gl_FragCoord origin is upper left 0:73 1 (const int) 0:73 Constant: 0:73 1.000000 -0:? Sequence -0:? Sequence +0:75 Sequence +0:75 Sequence 0:75 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:75 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index 4e1efadb..4649f291 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -185,8 +185,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:69 Sequence +0:69 Sequence 0:69 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:69 Pos: direct index for structure (temp 4-component vector of float) @@ -410,8 +410,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:69 Sequence +0:69 Sequence 0:69 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:69 Pos: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index ea1b5df3..ded93824 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -49,8 +49,8 @@ gl_FragCoord origin is upper left 0:35 1 (const int) 0:35 Constant: 0:35 1.000000 -0:? Sequence -0:? Sequence +0:37 Sequence +0:37 Sequence 0:37 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:37 Color: direct index for structure (temp 4-component vector of float) @@ -127,8 +127,8 @@ gl_FragCoord origin is upper left 0:35 1 (const int) 0:35 Constant: 0:35 1.000000 -0:? Sequence -0:? Sequence +0:37 Sequence +0:37 Sequence 0:37 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:37 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index 8d711296..6eaa6f7d 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -229,8 +229,8 @@ gl_FragCoord origin is upper left 0:73 1 (const int) 0:73 Constant: 0:73 1.000000 -0:? Sequence -0:? Sequence +0:75 Sequence +0:75 Sequence 0:75 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:75 Color: direct index for structure (temp 4-component vector of float) @@ -505,8 +505,8 @@ gl_FragCoord origin is upper left 0:73 1 (const int) 0:73 Constant: 0:73 1.000000 -0:? Sequence -0:? Sequence +0:75 Sequence +0:75 Sequence 0:75 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:75 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 665fc47a..776cd835 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -166,8 +166,8 @@ gl_FragCoord origin is upper left 0:66 1 (const int) 0:66 Constant: 0:66 1.000000 -0:? Sequence -0:? Sequence +0:68 Sequence +0:68 Sequence 0:68 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:68 Color: direct index for structure (temp 4-component vector of float) @@ -379,8 +379,8 @@ gl_FragCoord origin is upper left 0:66 1 (const int) 0:66 Constant: 0:66 1.000000 -0:? Sequence -0:? Sequence +0:68 Sequence +0:68 Sequence 0:68 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:68 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out index 7d49629d..8c637c14 100644 --- a/Test/baseResults/hlsl.matrixindex.frag.out +++ b/Test/baseResults/hlsl.matrixindex.frag.out @@ -117,8 +117,8 @@ gl_FragCoord origin is upper left 0:47 0 (const int) 0:47 Construct vec4 (temp 4-component vector of float) 0:47 'e2_11' (temp float) -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) @@ -252,8 +252,8 @@ gl_FragCoord origin is upper left 0:47 0 (const int) 0:47 Construct vec4 (temp 4-component vector of float) 0:47 'e2_11' (temp float) -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index 6d192c0a..e8d3630e 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -58,8 +58,8 @@ gl_FragCoord origin is upper left 0:18 Construct vec4 (temp 4-component vector of float) 0:18 Convert int to float (temp float) 0:18 'r07' (temp int) -0:? Sequence -0:? Sequence +0:19 Sequence +0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:19 color: direct index for structure (temp 4-component vector of float) @@ -133,8 +133,8 @@ gl_FragCoord origin is upper left 0:18 Construct vec4 (temp 4-component vector of float) 0:18 Convert int to float (temp float) 0:18 'r07' (temp int) -0:? Sequence -0:? Sequence +0:19 Sequence +0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:19 color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 281b680b..6bbbee64 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -31,8 +31,8 @@ gl_FragCoord origin is upper left 0:127 1 (const int) 0:127 Constant: 0:127 1.000000 -0:? Sequence -0:? Sequence +0:129 Sequence +0:129 Sequence 0:129 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:129 Color: direct index for structure (temp 4-component vector of float) @@ -86,8 +86,8 @@ gl_FragCoord origin is upper left 0:127 1 (const int) 0:127 Constant: 0:127 1.000000 -0:? Sequence -0:? Sequence +0:129 Sequence +0:129 Sequence 0:129 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:129 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index 40b6c4d9..e9205cfe 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -19,8 +19,8 @@ gl_FragCoord origin is upper left 0:11 1.000000 0:11 1.000000 0:11 1.000000 -0:? Sequence -0:? Sequence +0:12 Sequence +0:12 Sequence 0:12 move second child to first child (noContraction temp 4-component vector of float) 0:? 'color' (layout(location=0 ) noContraction out 4-component vector of float) 0:12 color: direct index for structure (noContraction temp 4-component vector of float) @@ -56,8 +56,8 @@ gl_FragCoord origin is upper left 0:11 1.000000 0:11 1.000000 0:11 1.000000 -0:? Sequence -0:? Sequence +0:12 Sequence +0:12 Sequence 0:12 move second child to first child (noContraction temp 4-component vector of float) 0:? 'color' (layout(location=0 ) noContraction out 4-component vector of float) 0:12 color: direct index for structure (noContraction temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index 25238beb..e3df54ff 100644 --- a/Test/baseResults/hlsl.promotions.frag.out +++ b/Test/baseResults/hlsl.promotions.frag.out @@ -772,8 +772,8 @@ gl_FragCoord origin is upper left 0:199 Constant: 0:199 0 (const int) 0:199 'outval' (temp 4-component vector of float) -0:? Sequence -0:? Sequence +0:200 Sequence +0:200 Sequence 0:200 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:200 Color: direct index for structure (temp 4-component vector of float) @@ -1562,8 +1562,8 @@ gl_FragCoord origin is upper left 0:199 Constant: 0:199 0 (const int) 0:199 'outval' (temp 4-component vector of float) -0:? Sequence -0:? Sequence +0:200 Sequence +0:200 Sequence 0:200 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:200 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 701229e0..bb2962d9 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -121,8 +121,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) @@ -277,8 +277,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 2746f16f..b6cc8c6d 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -231,8 +231,8 @@ gl_FragCoord origin is upper left 0:87 1 (const int) 0:87 Constant: 0:87 1.000000 -0:? Sequence -0:? Sequence +0:89 Sequence +0:89 Sequence 0:89 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:89 Color: direct index for structure (temp 4-component vector of float) @@ -500,8 +500,8 @@ gl_FragCoord origin is upper left 0:87 1 (const int) 0:87 Constant: 0:87 1.000000 -0:? Sequence -0:? Sequence +0:89 Sequence +0:89 Sequence 0:89 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:89 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index 48e3d85c..9de5f49b 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) @@ -316,8 +316,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index 4d64fa0b..f4646d44 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -100,8 +100,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) @@ -232,8 +232,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index 236889ba..539855e0 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) @@ -313,8 +313,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index 408c5ffa..9fb8b1a0 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -169,8 +169,8 @@ gl_FragCoord origin is upper left 0:48 1 (const int) 0:48 Constant: 0:48 1.000000 -0:? Sequence -0:? Sequence +0:50 Sequence +0:50 Sequence 0:50 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:50 Color: direct index for structure (temp 4-component vector of float) @@ -376,8 +376,8 @@ gl_FragCoord origin is upper left 0:48 1 (const int) 0:48 Constant: 0:48 1.000000 -0:? Sequence -0:? Sequence +0:50 Sequence +0:50 Sequence 0:50 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:50 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index ce7c4d33..643e0039 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -157,8 +157,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 2bad0c31..3ab84b9a 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -112,8 +112,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) @@ -256,8 +256,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index a968b749..05f53c70 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -148,8 +148,8 @@ gl_FragCoord origin is upper left 0:57 1 (const int) 0:57 Constant: 0:57 1.000000 -0:? Sequence -0:? Sequence +0:59 Sequence +0:59 Sequence 0:59 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:59 Color: direct index for structure (temp 4-component vector of float) @@ -342,8 +342,8 @@ gl_FragCoord origin is upper left 0:57 1 (const int) 0:57 Constant: 0:57 1.000000 -0:? Sequence -0:? Sequence +0:59 Sequence +0:59 Sequence 0:59 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:59 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index 94986cfd..d7a6b2f3 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:58 1 (const int) 0:58 Constant: 0:58 1.000000 -0:? Sequence -0:? Sequence +0:60 Sequence +0:60 Sequence 0:60 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:60 Color: direct index for structure (temp 4-component vector of float) @@ -324,8 +324,8 @@ gl_FragCoord origin is upper left 0:58 1 (const int) 0:58 Constant: 0:58 1.000000 -0:? Sequence -0:? Sequence +0:60 Sequence +0:60 Sequence 0:60 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:60 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index 7e3d0de9..021e08f6 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -112,8 +112,8 @@ gl_FragCoord origin is upper left 0:63 1 (const int) 0:63 Constant: 0:63 1.000000 -0:? Sequence -0:? Sequence +0:65 Sequence +0:65 Sequence 0:65 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:65 Color: direct index for structure (temp 4-component vector of float) @@ -270,8 +270,8 @@ gl_FragCoord origin is upper left 0:63 1 (const int) 0:63 Constant: 0:63 1.000000 -0:? Sequence -0:? Sequence +0:65 Sequence +0:65 Sequence 0:65 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:65 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index fab86ff3..73a2a89b 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -118,8 +118,8 @@ gl_FragCoord origin is upper left 0:64 1 (const int) 0:64 Constant: 0:64 1.000000 -0:? Sequence -0:? Sequence +0:66 Sequence +0:66 Sequence 0:66 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:66 Color: direct index for structure (temp 4-component vector of float) @@ -282,8 +282,8 @@ gl_FragCoord origin is upper left 0:64 1 (const int) 0:64 Constant: 0:64 1.000000 -0:? Sequence -0:? Sequence +0:66 Sequence +0:66 Sequence 0:66 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:66 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index adeb3cbc..c5009ff3 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -166,8 +166,8 @@ gl_FragCoord origin is upper left 0:57 1 (const int) 0:57 Constant: 0:57 1.000000 -0:? Sequence -0:? Sequence +0:59 Sequence +0:59 Sequence 0:59 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:59 Color: direct index for structure (temp 4-component vector of float) @@ -378,8 +378,8 @@ gl_FragCoord origin is upper left 0:57 1 (const int) 0:57 Constant: 0:57 1.000000 -0:? Sequence -0:? Sequence +0:59 Sequence +0:59 Sequence 0:59 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:59 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 0492ae78..b8f55b8e 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -157,8 +157,8 @@ gl_FragCoord origin is upper left 0:58 1 (const int) 0:58 Constant: 0:58 1.000000 -0:? Sequence -0:? Sequence +0:60 Sequence +0:60 Sequence 0:60 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:60 Color: direct index for structure (temp 4-component vector of float) @@ -360,8 +360,8 @@ gl_FragCoord origin is upper left 0:58 1 (const int) 0:58 Constant: 0:58 1.000000 -0:? Sequence -0:? Sequence +0:60 Sequence +0:60 Sequence 0:60 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:60 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index c50872f4..b30a252e 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -124,8 +124,8 @@ gl_FragCoord origin is upper left 0:63 1 (const int) 0:63 Constant: 0:63 1.000000 -0:? Sequence -0:? Sequence +0:65 Sequence +0:65 Sequence 0:65 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:65 Color: direct index for structure (temp 4-component vector of float) @@ -294,8 +294,8 @@ gl_FragCoord origin is upper left 0:63 1 (const int) 0:63 Constant: 0:63 1.000000 -0:? Sequence -0:? Sequence +0:65 Sequence +0:65 Sequence 0:65 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:65 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 88f8d347..19d262ad 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -130,8 +130,8 @@ gl_FragCoord origin is upper left 0:64 1 (const int) 0:64 Constant: 0:64 1.000000 -0:? Sequence -0:? Sequence +0:66 Sequence +0:66 Sequence 0:66 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:66 Color: direct index for structure (temp 4-component vector of float) @@ -306,8 +306,8 @@ gl_FragCoord origin is upper left 0:64 1 (const int) 0:64 Constant: 0:64 1.000000 -0:? Sequence -0:? Sequence +0:66 Sequence +0:66 Sequence 0:66 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:66 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index ca057fd7..1513492a 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -175,8 +175,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) @@ -385,8 +385,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 326bd016..92c0c342 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -223,8 +223,8 @@ gl_FragCoord origin is upper left 0:48 1 (const int) 0:48 Constant: 0:48 1.000000 -0:? Sequence -0:? Sequence +0:50 Sequence +0:50 Sequence 0:50 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:50 Color: direct index for structure (temp 4-component vector of float) @@ -484,8 +484,8 @@ gl_FragCoord origin is upper left 0:48 1 (const int) 0:48 Constant: 0:48 1.000000 -0:? Sequence -0:? Sequence +0:50 Sequence +0:50 Sequence 0:50 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:50 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index ba56951e..e8909345 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -215,8 +215,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:48 Pos: direct index for structure (temp 4-component vector of float) @@ -461,8 +461,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:48 Pos: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index b000b538..9145aa4d 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) @@ -424,8 +424,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index 8eee2b50..e964ff93 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -130,8 +130,8 @@ gl_FragCoord origin is upper left 0:36 1 (const int) 0:36 Constant: 0:36 1.000000 -0:? Sequence -0:? Sequence +0:38 Sequence +0:38 Sequence 0:38 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:38 Color: direct index for structure (temp 4-component vector of float) @@ -295,8 +295,8 @@ gl_FragCoord origin is upper left 0:36 1 (const int) 0:36 Constant: 0:36 1.000000 -0:? Sequence -0:? Sequence +0:38 Sequence +0:38 Sequence 0:38 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:38 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 4254e04b..d031665f 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) @@ -313,8 +313,8 @@ gl_FragCoord origin is upper left 0:40 1 (const int) 0:40 Constant: 0:40 1.000000 -0:? Sequence -0:? Sequence +0:42 Sequence +0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:42 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 44802a98..4a937502 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -169,8 +169,8 @@ gl_FragCoord origin is upper left 0:49 1 (const int) 0:49 Constant: 0:49 1.000000 -0:? Sequence -0:? Sequence +0:51 Sequence +0:51 Sequence 0:51 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:51 Color: direct index for structure (temp 4-component vector of float) @@ -377,8 +377,8 @@ gl_FragCoord origin is upper left 0:49 1 (const int) 0:49 Constant: 0:49 1.000000 -0:? Sequence -0:? Sequence +0:51 Sequence +0:51 Sequence 0:51 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:51 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index e76a3955..c18fa89b 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -161,8 +161,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:48 Pos: direct index for structure (temp 4-component vector of float) @@ -353,8 +353,8 @@ Shader version: 450 0:? 0.000000 0:? 0.000000 0:? 0.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Pos' (out 4-component vector of float Position) 0:48 Pos: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 043a04ca..4d816499 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -157,8 +157,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:46 1 (const int) 0:46 Constant: 0:46 1.000000 -0:? Sequence -0:? Sequence +0:48 Sequence +0:48 Sequence 0:48 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:48 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index bfc444da..ef3dcf19 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -112,8 +112,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) @@ -256,8 +256,8 @@ gl_FragCoord origin is upper left 0:34 1 (const int) 0:34 Constant: 0:34 1.000000 -0:? Sequence -0:? Sequence +0:36 Sequence +0:36 Sequence 0:36 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:36 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index 43232161..a9f92768 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -19,8 +19,8 @@ gl_FragCoord origin is upper left 0:16 1.000000 0:16 1.000000 0:16 1.000000 -0:? Sequence -0:? Sequence +0:17 Sequence +0:17 Sequence 0:17 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:17 color: direct index for structure (temp 4-component vector of float) @@ -55,8 +55,8 @@ gl_FragCoord origin is upper left 0:16 1.000000 0:16 1.000000 0:16 1.000000 -0:? Sequence -0:? Sequence +0:17 Sequence +0:17 Sequence 0:17 move second child to first child (temp 4-component vector of float) 0:? 'color' (layout(location=0 ) out 4-component vector of float) 0:17 color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index 4fdfecce..8593db62 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -15,8 +15,8 @@ gl_FragCoord origin is upper left 0:? 0.000000 0:? 0.000000 0:? 1.000000 -0:? Sequence -0:? Sequence +0:19 Sequence +0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:19 Color: direct index for structure (temp 4-component vector of float) @@ -49,8 +49,8 @@ gl_FragCoord origin is upper left 0:? 0.000000 0:? 0.000000 0:? 1.000000 -0:? Sequence -0:? Sequence +0:19 Sequence +0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? 'Color' (layout(location=0 ) out 4-component vector of float) 0:19 Color: direct index for structure (temp 4-component vector of float) diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out index 193ccc1c..f3e56b6a 100755 --- a/Test/baseResults/hlsl.structin.vert.out +++ b/Test/baseResults/hlsl.structin.vert.out @@ -32,8 +32,8 @@ Shader version: 450 0:11 0 (const int) 0:11 'd' (layout(location=0 ) in 4-component vector of float) 0:11 'e' (layout(location=5 ) in 4-component vector of float) -0:? Sequence -0:? Sequence +0:13 Sequence +0:13 Sequence 0:13 move second child to first child (temp 2-element array of 4-component vector of float) 0:? 'm' (layout(location=0 ) out 2-element array of 4-component vector of float) 0:13 m: direct index for structure (temp 2-element array of 4-component vector of float) @@ -100,8 +100,8 @@ Shader version: 450 0:11 0 (const int) 0:11 'd' (layout(location=0 ) in 4-component vector of float) 0:11 'e' (layout(location=5 ) in 4-component vector of float) -0:? Sequence -0:? Sequence +0:13 Sequence +0:13 Sequence 0:13 move second child to first child (temp 2-element array of 4-component vector of float) 0:? 'm' (layout(location=0 ) out 2-element array of 4-component vector of float) 0:13 m: direct index for structure (temp 2-element array of 4-component vector of float) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 0db44dca..c003acd9 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.1544" +#define GLSLANG_REVISION "Overload400-PrecQual.1545" #define GLSLANG_DATE "01-Oct-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 63d9c3d7..2fa892f4 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -1115,7 +1115,7 @@ TIntermNode* HlslParseContext::handleReturnValue(const TSourceLoc& loc, TIntermT entryPointOutput->getType()); TIntermNode* returnSequence = handleAssign(loc, EOpAssign, left, converted); returnSequence = intermediate.makeAggregate(returnSequence); - returnSequence = intermediate.growAggregate(returnSequence, intermediate.addBranch(EOpReturn, loc)); + returnSequence = intermediate.growAggregate(returnSequence, intermediate.addBranch(EOpReturn, loc), loc); returnSequence->getAsAggregate()->setOperator(EOpSequence); return returnSequence; @@ -1183,7 +1183,7 @@ TIntermTyped* HlslParseContext::handleAssign(const TSourceLoc& loc, TOperator op EOpIndexDirectStruct, *members[member].type); TIntermTyped* subLeft = getMember(flattenLeft, left, *leftVariables, member, EOpIndexDirectStruct, *members[member].type); - assignList = intermediate.growAggregate(assignList, intermediate.addAssign(op, subLeft, subRight, loc)); + assignList = intermediate.growAggregate(assignList, intermediate.addAssign(op, subLeft, subRight, loc), loc); } } @@ -1201,7 +1201,7 @@ TIntermTyped* HlslParseContext::handleAssign(const TSourceLoc& loc, TOperator op TIntermTyped* subLeft = getMember(flattenLeft, left, *leftVariables, element, EOpIndexDirect, dereferencedType); - assignList = intermediate.growAggregate(assignList, intermediate.addAssign(op, subLeft, subRight, loc)); + assignList = intermediate.growAggregate(assignList, intermediate.addAssign(op, subLeft, subRight, loc), loc); } } @@ -2393,18 +2393,17 @@ void HlslParseContext::addInputArgumentConversions(const TFunction& function, TI // The deepest will copy member-by-member to build the structure to pass. // The level above that will be a two-operand EOpComma sequence that follows the copy by the // object itself. - TSourceLoc dummyLoc; // ?? fix these everywhere to be arguments[i]->getLoc()? - dummyLoc.init(); TVariable* internalAggregate = makeInternalVariable("aggShadow", *function[i].type); internalAggregate->getWritableType().getQualifier().makeTemporary(); TIntermSymbol* internalSymbolNode = new TIntermSymbol(internalAggregate->getUniqueId(), internalAggregate->getName(), internalAggregate->getType()); + internalSymbolNode->setLoc(arg->getLoc()); // This makes the deepest level, the member-wise copy - TIntermAggregate* assignAgg = handleAssign(dummyLoc, EOpAssign, internalSymbolNode, arg)->getAsAggregate(); + TIntermAggregate* assignAgg = handleAssign(arg->getLoc(), EOpAssign, internalSymbolNode, arg)->getAsAggregate(); // Now, pair that with the resulting aggregate. - assignAgg = intermediate.growAggregate(assignAgg, internalSymbolNode); + assignAgg = intermediate.growAggregate(assignAgg, internalSymbolNode, arg->getLoc()); assignAgg->setOperator(EOpComma); assignAgg->setType(internalAggregate->getType()); setArg(i, assignAgg);