From 8578c5f15a807765f7dcabc2336a48bda1679710 Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Sat, 13 Apr 2013 16:48:22 +0300 Subject: [PATCH] tests: update output after #26 merge --- tests/vertex/MF-GodRays-outES.txt | 6 +++--- tests/vertex/const-main-arg-outES.txt | 2 +- tests/vertex/funccalls-outES.txt | 8 ++++---- tests/vertex/funccalls2-outES.txt | 4 ++-- tests/vertex/funccalls3-outES.txt | 4 ++-- tests/vertex/in-struct-ret-struct-outES.txt | 8 ++++---- tests/vertex/in-vals-ret-struct-outES.txt | 8 ++++---- tests/vertex/loops-for-outES.txt | 4 ++-- tests/vertex/loops-formultiple-outES.txt | 4 ++-- tests/vertex/loops-forvarious-outES.txt | 4 ++-- tests/vertex/nestedscope-outES.txt | 8 ++++---- tests/vertex/types-outES.txt | 8 ++++---- tests/vertex/z-WaterDisplRefr-outES.txt | 12 ++++++------ tests/vertex/z-collectshadows-outES.txt | 6 +++--- tests/vertex/z-mia-lightmap-outES.txt | 18 +++++++++--------- tests/vertex/z-mia-rt-outES.txt | 20 ++++++++++---------- tests/vertex/z-particle-outES.txt | 6 +++--- tests/vertex/z-prepasslight-outES.txt | 6 +++--- tests/vertex/z-treeleaf-outES.txt | 12 ++++++------ 19 files changed, 74 insertions(+), 74 deletions(-) diff --git a/tests/vertex/MF-GodRays-outES.txt b/tests/vertex/MF-GodRays-outES.txt index 17a19ad..4201e2e 100644 --- a/tests/vertex/MF-GodRays-outES.txt +++ b/tests/vertex/MF-GodRays-outES.txt @@ -158,9 +158,9 @@ void main() { xlt_v.texcoord1 = vec4(gl_MultiTexCoord1); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - xlv_SV_POSITION = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_TEXCOORD1 = vec4( xl_retval.color); + xlv_SV_POSITION = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_TEXCOORD1 = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/const-main-arg-outES.txt b/tests/vertex/const-main-arg-outES.txt index 5a74afc..d4b5079 100644 --- a/tests/vertex/const-main-arg-outES.txt +++ b/tests/vertex/const-main-arg-outES.txt @@ -21,5 +21,5 @@ void main() { VertexInput xlt_xlat_var_input; xlt_xlat_var_input.pos = vec4(gl_Vertex); xl_retval = xlat_main( xlt_xlat_var_input); - gl_Position = vec4( xl_retval.pos); + gl_Position = vec4(xl_retval.pos); } diff --git a/tests/vertex/funccalls-outES.txt b/tests/vertex/funccalls-outES.txt index ea350e2..da037d4 100644 --- a/tests/vertex/funccalls-outES.txt +++ b/tests/vertex/funccalls-outES.txt @@ -52,10 +52,10 @@ void main() { xlt_v.normal = vec3(gl_Normal); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_FOG = float( xl_retval.fog); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_FOG = float(xl_retval.fog); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/funccalls2-outES.txt b/tests/vertex/funccalls2-outES.txt index 2c44980..cabcdb4 100644 --- a/tests/vertex/funccalls2-outES.txt +++ b/tests/vertex/funccalls2-outES.txt @@ -51,8 +51,8 @@ void main() { a2v xlt_v; xlt_v.pos = vec4(gl_Vertex); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/funccalls3-outES.txt b/tests/vertex/funccalls3-outES.txt index 05fdbe4..9d8dbf8 100644 --- a/tests/vertex/funccalls3-outES.txt +++ b/tests/vertex/funccalls3-outES.txt @@ -36,8 +36,8 @@ void main() { a2v xlt_v; xlt_v.pos = vec4(gl_Vertex); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/in-struct-ret-struct-outES.txt b/tests/vertex/in-struct-ret-struct-outES.txt index baaf376..a162941 100644 --- a/tests/vertex/in-struct-ret-struct-outES.txt +++ b/tests/vertex/in-struct-ret-struct-outES.txt @@ -38,10 +38,10 @@ void main() { xlt_v.normal = vec3(gl_Normal); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_FOG = float( xl_retval.fog); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_FOG = float(xl_retval.fog); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/in-vals-ret-struct-outES.txt b/tests/vertex/in-vals-ret-struct-outES.txt index 02dadea..68eca17 100644 --- a/tests/vertex/in-vals-ret-struct-outES.txt +++ b/tests/vertex/in-vals-ret-struct-outES.txt @@ -26,10 +26,10 @@ varying highp vec4 xlv_COLOR; void main() { v2f xl_retval; xl_retval = xlat_main( vec4(gl_Vertex), vec2(gl_MultiTexCoord0), vec3(gl_Normal), vec4(gl_Color)); - gl_Position = vec4( xl_retval.pos); - xlv_FOG = float( xl_retval.fog); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_FOG = float(xl_retval.fog); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/loops-for-outES.txt b/tests/vertex/loops-for-outES.txt index 1dd853d..39e0917 100644 --- a/tests/vertex/loops-for-outES.txt +++ b/tests/vertex/loops-for-outES.txt @@ -55,8 +55,8 @@ void main() { xlt_v.vertex = vec4(gl_Vertex); xlt_v.normal = vec3(gl_Normal); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/loops-formultiple-outES.txt b/tests/vertex/loops-formultiple-outES.txt index c98d5cc..8d74a44 100644 --- a/tests/vertex/loops-formultiple-outES.txt +++ b/tests/vertex/loops-formultiple-outES.txt @@ -38,8 +38,8 @@ void main() { xlt_v.vertex = vec4(gl_Vertex); xlt_v.normal = vec3(gl_Normal); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/loops-forvarious-outES.txt b/tests/vertex/loops-forvarious-outES.txt index 8e9e417..c3ed4d1 100644 --- a/tests/vertex/loops-forvarious-outES.txt +++ b/tests/vertex/loops-forvarious-outES.txt @@ -78,8 +78,8 @@ void main() { xlt_v.vertex = vec4(gl_Vertex); xlt_v.normal = vec3(gl_Normal); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/nestedscope-outES.txt b/tests/vertex/nestedscope-outES.txt index 2b2d2b1..e4f4d7e 100644 --- a/tests/vertex/nestedscope-outES.txt +++ b/tests/vertex/nestedscope-outES.txt @@ -41,10 +41,10 @@ void main() { xlt_v.normal = vec3(gl_Normal); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_FOG = float( xl_retval.fog); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_FOG = float(xl_retval.fog); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/types-outES.txt b/tests/vertex/types-outES.txt index 1b763fa..45a0fac 100644 --- a/tests/vertex/types-outES.txt +++ b/tests/vertex/types-outES.txt @@ -61,10 +61,10 @@ void main() { xlt_v.normal = vec3(gl_Normal); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_FOG = float( xl_retval.fog); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_COLOR = vec4( xl_retval.color); + gl_Position = vec4(xl_retval.pos); + xlv_FOG = float(xl_retval.fog); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_COLOR = vec4(xl_retval.color); } // uniforms: diff --git a/tests/vertex/z-WaterDisplRefr-outES.txt b/tests/vertex/z-WaterDisplRefr-outES.txt index 8d3bcd8..56760c2 100644 --- a/tests/vertex/z-WaterDisplRefr-outES.txt +++ b/tests/vertex/z-WaterDisplRefr-outES.txt @@ -172,12 +172,12 @@ void main() { xlt_v.normal = vec3(gl_Normal); xlt_v.texcoord = vec4(gl_MultiTexCoord0); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.normalInterpolator); - xlv_TEXCOORD1 = vec4( xl_retval.viewInterpolator); - xlv_TEXCOORD2 = vec4( xl_retval.bumpCoords); - xlv_TEXCOORD3 = vec4( xl_retval.screenPos); - xlv_TEXCOORD4 = vec4( xl_retval.grabPassPos); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.normalInterpolator); + xlv_TEXCOORD1 = vec4(xl_retval.viewInterpolator); + xlv_TEXCOORD2 = vec4(xl_retval.bumpCoords); + xlv_TEXCOORD3 = vec4(xl_retval.screenPos); + xlv_TEXCOORD4 = vec4(xl_retval.grabPassPos); } // uniforms: diff --git a/tests/vertex/z-collectshadows-outES.txt b/tests/vertex/z-collectshadows-outES.txt index 6163946..4325594 100644 --- a/tests/vertex/z-collectshadows-outES.txt +++ b/tests/vertex/z-collectshadows-outES.txt @@ -33,9 +33,9 @@ void main() { xlt_v.texcoord = vec2(gl_MultiTexCoord0); xlt_v.texcoord1 = vec3(gl_MultiTexCoord1); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec2( xl_retval.uv); - xlv_TEXCOORD1 = vec3( xl_retval.ray); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec2(xl_retval.uv); + xlv_TEXCOORD1 = vec3(xl_retval.ray); } // uniforms: diff --git a/tests/vertex/z-mia-lightmap-outES.txt b/tests/vertex/z-mia-lightmap-outES.txt index c4575a4..a539f5f 100644 --- a/tests/vertex/z-mia-lightmap-outES.txt +++ b/tests/vertex/z-mia-lightmap-outES.txt @@ -226,15 +226,15 @@ void main() { xlt_v.texcoord1 = vec4(gl_MultiTexCoord1); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.pack0); - xlv_TEXCOORD1 = vec3( xl_retval.worldPos); - xlv_TEXCOORD2 = vec3( xl_retval.viewDir); - xlv_TEXCOORD3 = vec4( xl_retval.TtoW0); - xlv_TEXCOORD4 = vec4( xl_retval.TtoW1); - xlv_TEXCOORD5 = vec4( xl_retval.TtoW2); - xlv_TEXCOORD6 = vec4( xl_retval.lmap); - xlv_TEXCOORD7 = vec3( xl_retval.lightDir); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.pack0); + xlv_TEXCOORD1 = vec3(xl_retval.worldPos); + xlv_TEXCOORD2 = vec3(xl_retval.viewDir); + xlv_TEXCOORD3 = vec4(xl_retval.TtoW0); + xlv_TEXCOORD4 = vec4(xl_retval.TtoW1); + xlv_TEXCOORD5 = vec4(xl_retval.TtoW2); + xlv_TEXCOORD6 = vec4(xl_retval.lmap); + xlv_TEXCOORD7 = vec3(xl_retval.lightDir); } // uniforms: diff --git a/tests/vertex/z-mia-rt-outES.txt b/tests/vertex/z-mia-rt-outES.txt index 987ba1d..d4bcd3f 100644 --- a/tests/vertex/z-mia-rt-outES.txt +++ b/tests/vertex/z-mia-rt-outES.txt @@ -224,16 +224,16 @@ void main() { xlt_v.texcoord1 = vec4(gl_MultiTexCoord1); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.pack0); - xlv_TEXCOORD1 = vec3( xl_retval.worldPos); - xlv_TEXCOORD2 = vec3( xl_retval.viewDir); - xlv_TEXCOORD3 = vec4( xl_retval.TtoW0); - xlv_TEXCOORD4 = vec4( xl_retval.TtoW1); - xlv_TEXCOORD5 = vec4( xl_retval.TtoW2); - xlv_TEXCOORD6 = vec3( xl_retval.lightDir); - xlv_TEXCOORD7 = vec3( xl_retval.vlight); - xlv_TEXCOORD8 = vec2( xl_retval._LightCoord); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.pack0); + xlv_TEXCOORD1 = vec3(xl_retval.worldPos); + xlv_TEXCOORD2 = vec3(xl_retval.viewDir); + xlv_TEXCOORD3 = vec4(xl_retval.TtoW0); + xlv_TEXCOORD4 = vec4(xl_retval.TtoW1); + xlv_TEXCOORD5 = vec4(xl_retval.TtoW2); + xlv_TEXCOORD6 = vec3(xl_retval.lightDir); + xlv_TEXCOORD7 = vec3(xl_retval.vlight); + xlv_TEXCOORD8 = vec2(xl_retval._LightCoord); } // uniforms: diff --git a/tests/vertex/z-particle-outES.txt b/tests/vertex/z-particle-outES.txt index ac759e4..fee33a4 100644 --- a/tests/vertex/z-particle-outES.txt +++ b/tests/vertex/z-particle-outES.txt @@ -34,9 +34,9 @@ void main() { xlt_v.color = vec4(gl_Color); xlt_v.texcoord = vec2(gl_MultiTexCoord0); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.vertex); - xlv_COLOR = vec4( xl_retval.color); - xlv_TEXCOORD0 = vec2( xl_retval.texcoord); + gl_Position = vec4(xl_retval.vertex); + xlv_COLOR = vec4(xl_retval.color); + xlv_TEXCOORD0 = vec2(xl_retval.texcoord); } // uniforms: diff --git a/tests/vertex/z-prepasslight-outES.txt b/tests/vertex/z-prepasslight-outES.txt index b37fc54..6b7466e 100644 --- a/tests/vertex/z-prepasslight-outES.txt +++ b/tests/vertex/z-prepasslight-outES.txt @@ -43,9 +43,9 @@ void main() { xlt_v.vertex = vec4(gl_Vertex); xlt_v.normal = vec3(gl_Normal); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec4( xl_retval.uv); - xlv_TEXCOORD1 = vec3( xl_retval.ray); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec4(xl_retval.uv); + xlv_TEXCOORD1 = vec3(xl_retval.ray); } // uniforms: diff --git a/tests/vertex/z-treeleaf-outES.txt b/tests/vertex/z-treeleaf-outES.txt index 1e13bfa..919ca00 100644 --- a/tests/vertex/z-treeleaf-outES.txt +++ b/tests/vertex/z-treeleaf-outES.txt @@ -171,12 +171,12 @@ void main() { xlt_v.texcoord1 = vec4(gl_MultiTexCoord1); xlt_v.color = vec4(gl_Color); xl_retval = xlat_main( xlt_v); - gl_Position = vec4( xl_retval.pos); - xlv_TEXCOORD0 = vec2( xl_retval.hip_pack0); - xlv_COLOR0 = vec4( xl_retval.lop_color); - xlv_TEXCOORD1 = vec3( xl_retval.lightDir); - xlv_TEXCOORD2 = vec3( xl_retval.viewDir); - xlv_TEXCOORD3 = vec2( xl_retval._LightCoord); + gl_Position = vec4(xl_retval.pos); + xlv_TEXCOORD0 = vec2(xl_retval.hip_pack0); + xlv_COLOR0 = vec4(xl_retval.lop_color); + xlv_TEXCOORD1 = vec3(xl_retval.lightDir); + xlv_TEXCOORD2 = vec3(xl_retval.viewDir); + xlv_TEXCOORD3 = vec2(xl_retval._LightCoord); } // uniforms: