[Piglit] [PATCH 1/3] glsl-1.50: Don't try to use embedded struct definitions

Ian Romanick idr at freedesktop.org
Tue Jun 17 15:51:49 PDT 2014


Were these tests passing on Mesa?  If so, we should add some tests and
file a bug. :)

These changes are

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 06/14/2014 05:53 PM, Chris Forbes wrote:
> Interface blocks may contain instances of predeclared structs,
> but not embedded definitions.
> 
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> ---
>  .../execution/interface-blocks-complex-vs-fs.shader_test | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/spec/glsl-1.50/execution/interface-blocks-complex-vs-fs.shader_test b/tests/spec/glsl-1.50/execution/interface-blocks-complex-vs-fs.shader_test
> index e2cef35..2cfa40d 100644
> --- a/tests/spec/glsl-1.50/execution/interface-blocks-complex-vs-fs.shader_test
> +++ b/tests/spec/glsl-1.50/execution/interface-blocks-complex-vs-fs.shader_test
> @@ -32,12 +32,14 @@ uniform ublk {
>      uniform vec4 color;
>  } vs2ublk;
>  
> +struct gb_struct {
> +    vec2 gb;
> +};
> +
>  out vblk2 {
>      float unused;
>      float a;
> -    struct gb_struct {
> -        vec2 gb;
> -    } gb_array[3];
> +    gb_struct gb_array[3];
>  } gb_blk;
>  
>  /* Use an array within an interface block.
> @@ -94,12 +96,14 @@ in vblk1 {
>      vec4 r;
>  } r_blk;
>  
> +struct gb_struct {
> +    vec2 gb;
> +};
> +
>  in vblk2 {
>      float unused;
>      float a;
> -    struct gb_struct {
> -        vec2 gb;
> -    } gb_array[3];
> +    gb_struct gb_array[3];
>  } gb_blk;
>  
>  in vblk3 {
> 



More information about the Piglit mailing list