[Piglit] [PATCH] program_interface_query: use format layout qualifiers instead of size* layout qualifiers

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 02/11/2016 02:42 PM, Alejandro Piñeiro wrote:
>  From ARB_shader_image_load_store spec:
>
> "    (0) How does this extension differ from the similar
>          EXT_shader_image_load_store?
>
>        RESOLVED:  The functionality provided by this extension is very similar
>        to that provided by EXT_shader_image_load_stores.  There are some
>        functional differences.
>
>          * "size" layout qualifiers replaced with "format" qualifiers.
>
>          * Image loads aren't restricted to "1x8", "1x16", "1x32", "2x32", and
>            "4x32" formats.  Instead, each supported image format has a layout
>            qualifier, and values loaded from images are converted to an
>            vec4/ivec4/uvec4 representation appropriate for the image format."
>
> size4x32 was valid for EXT_shader_image_load_store. That explains
> why this test works properly on proprietary NVIDIA drivers, as
> both extensions are supported.
>
> Fixes freedesktop bug #93336
> ---
>   tests/spec/arb_program_interface_query/common.h            | 2 +-
>   tests/spec/arb_program_interface_query/resource-location.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/spec/arb_program_interface_query/common.h b/tests/spec/arb_program_interface_query/common.h
> index 698fb92..d46ff26 100755
> --- a/tests/spec/arb_program_interface_query/common.h
> +++ b/tests/spec/arb_program_interface_query/common.h
> @@ -312,7 +312,7 @@ static const char cs_sub[] =
>   	"uniform cs_uniform_block {\n"
>   	"	uniform vec4 cs_test;\n"
>   	"};\n"
> -	"layout(size4x32) uniform image2D tex;\n"
> +	"layout(rgba32f) uniform image2D tex;\n"
>   	"subroutine vec4 com_offset();\n"
>   	"subroutine uniform com_offset COMPUTE;\n"
>   	"subroutine (com_offset) vec4 css() { return vec4(1, 0, 0, 0); }\n"
> diff --git a/tests/spec/arb_program_interface_query/resource-location.c b/tests/spec/arb_program_interface_query/resource-location.c
> index 3c29627..b7cfa2b 100755
> --- a/tests/spec/arb_program_interface_query/resource-location.c
> +++ b/tests/spec/arb_program_interface_query/resource-location.c
> @@ -166,7 +166,7 @@ static const char compute_subroutine_text[] =
>   	"#extension GL_ARB_shader_image_load_store : require\n"
>   	"#extension GL_ARB_compute_shader : require\n"
>   	"layout(local_size_x = 4) in;\n"
> -	"layout(size4x32) uniform image2D tex;\n"
> +	"layout(rgba32f) uniform image2D tex;\n"
>   	"subroutine vec4 com_offset();\n"
>   	"layout (location = 3) subroutine uniform com_offset COMPUTE;\n"
>   	"subroutine (com_offset) vec4 x() { return vec4(1.0, 0.0, 0.0, 0.0); }\n"