[2/4] glsl-1.20/fs-deref-literal-array-of-structs-with-multiple-members-large-array: Fix it

Submitted by Nicolai Hähnle on Sept. 13, 2018, 6:10 p.m.

Details

Message ID 20180913181049.16397-3-nhaehnle@gmail.com
State New
Headers show
Series "Autumn cleaning: misc test case additions and fixes" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Nicolai Hähnle Sept. 13, 2018, 6:10 p.m.
From: Nicolai Hähnle <nicolai.haehnle@amd.com>

Hard to believe that this was never noticed...
---
 ...f-structs-with-multiple-members-large-array.shader_test | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test b/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
index ff2b34da7..96cf0bfa6 100644
--- a/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
+++ b/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
@@ -12,21 +12,21 @@  GLSL >= 1.20
 [vertex shader]
 void main()
 {
   gl_Position = gl_Vertex;
 }
 
 [fragment shader]
 struct Foo {
   int value;
 
-  /* A second member of a differnt size ensures we calculate member offsets
+  /* A second member of a different size ensures we calculate member offsets
    * correctly.
    */
   ivec2 value2;
 };
 
 uniform int i;
 uniform ivec2 expected_value;
 
 void main()
 {
@@ -40,18 +40,17 @@  void main()
     gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
 }
 
 [test]
 uniform int i 0
 uniform ivec2 expected_value 200 300
 draw rect -1 -1 1 1
 uniform int i 1
 uniform ivec2 expected_value 500 600
 draw rect 0 -1 1 1
-probe all rgba 0.0 1.0 0.0 1.0
-uniform int i 0
+uniform int i 2
 uniform ivec2 expected_value 800 900
 draw rect -1 0 1 1
-uniform int i 1
+uniform int i 3
 uniform ivec2 expected_value 1100 1200
 draw rect 0 0 1 1
 probe all rgba 0.0 1.0 0.0 1.0

Comments

Whoops I probably did something silly like forgot to commit the rest of 
the changes to that test.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

On 14/9/18 4:10 am, Nicolai Hähnle wrote:
> From: Nicolai Hähnle <nicolai.haehnle@amd.com>
> 
> Hard to believe that this was never noticed...
> ---
>   ...f-structs-with-multiple-members-large-array.shader_test | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test b/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
> index ff2b34da7..96cf0bfa6 100644
> --- a/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
> +++ b/tests/spec/glsl-1.20/execution/fs-deref-literal-array-of-structs-with-multiple-members-large-array.shader_test
> @@ -12,21 +12,21 @@ GLSL >= 1.20
>   [vertex shader]
>   void main()
>   {
>     gl_Position = gl_Vertex;
>   }
>   
>   [fragment shader]
>   struct Foo {
>     int value;
>   
> -  /* A second member of a differnt size ensures we calculate member offsets
> +  /* A second member of a different size ensures we calculate member offsets
>      * correctly.
>      */
>     ivec2 value2;
>   };
>   
>   uniform int i;
>   uniform ivec2 expected_value;
>   
>   void main()
>   {
> @@ -40,18 +40,17 @@ void main()
>       gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
>   }
>   
>   [test]
>   uniform int i 0
>   uniform ivec2 expected_value 200 300
>   draw rect -1 -1 1 1
>   uniform int i 1
>   uniform ivec2 expected_value 500 600
>   draw rect 0 -1 1 1
> -probe all rgba 0.0 1.0 0.0 1.0
> -uniform int i 0
> +uniform int i 2
>   uniform ivec2 expected_value 800 900
>   draw rect -1 0 1 1
> -uniform int i 1
> +uniform int i 3
>   uniform ivec2 expected_value 1100 1200
>   draw rect 0 0 1 1
>   probe all rgba 0.0 1.0 0.0 1.0
>