[Piglit] [V2 2/8] ARB_explicit_uniform_location: test sequential array elements

[Pohjolainen, Topi]

On Fri, Mar 14, 2014 at 01:23:23PM +0200, Tapani P?lli wrote:
> v2: set values directly to shader, simplify overall (Topi)
>     fix style issues, use asprintf (Anuj)
> 
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>  tests/all.py                                       |  1 +
>  .../CMakeLists.gl.txt                              |  1 +
>  .../arb_explicit_uniform_location/array-elements.c | 90 ++++++++++++++++++++++
>  3 files changed, 92 insertions(+)
>  create mode 100644 tests/spec/arb_explicit_uniform_location/array-elements.c
> 
> diff --git a/tests/all.py b/tests/all.py
> index 25ec0ea..03202cd 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -1926,6 +1926,7 @@ import_glsl_parser_tests(arb_explicit_uniform_location,
>                           [''])
>  add_plain_test(arb_explicit_uniform_location, 'arb_explicit_uniform_location-minmax')
>  add_plain_test(arb_explicit_uniform_location, 'arb_explicit_uniform_location-boundaries')
> +add_plain_test(arb_explicit_uniform_location, 'arb_explicit_uniform_location-array-elements')
>  
>  arb_texture_buffer_object = Group()
>  spec['ARB_texture_buffer_object'] = arb_texture_buffer_object
> diff --git a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
> index e871ca1..945c80d 100644
> --- a/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
> +++ b/tests/spec/arb_explicit_uniform_location/CMakeLists.gl.txt
> @@ -11,3 +11,4 @@ link_libraries (
>  
>  piglit_add_executable (arb_explicit_uniform_location-minmax minmax.c)
>  piglit_add_executable (arb_explicit_uniform_location-boundaries loc-boundaries.c)
> +piglit_add_executable (arb_explicit_uniform_location-array-elements array-elements.c)
> diff --git a/tests/spec/arb_explicit_uniform_location/array-elements.c b/tests/spec/arb_explicit_uniform_location/array-elements.c
> new file mode 100644
> index 0000000..f4e3cb2
> --- /dev/null
> +++ b/tests/spec/arb_explicit_uniform_location/array-elements.c
> @@ -0,0 +1,90 @@
> +/*
> + * Copyright © 2014 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +/**
> + * \file array-elements.c
> + *
> + * Tests that array elements get sequential locations.
> + *
> + * https://www.opengl.org/registry/specs/ARB/explicit_uniform_location.txt
> + *
> + * Specification states : "Individual elements of a uniform array are assigned
> + *                         consecutive locations with the first element taking
> + *                         location <location>."
> + */
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_compat_version = 20;
> +	config.window_visual = PIGLIT_GL_VISUAL_RGB;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	return PIGLIT_FAIL;
> +}
> +
> +const char v_sha[] =

This could be static.

> +	"vec4 vertex;\n"
> +	"void main() {\n"
> +		"gl_Position = vertex;\n"
> +	"}";
> +
> +const char f_sha[] =

Same here.

> +	"#extension GL_ARB_explicit_uniform_location: require\n"
> +	"#define ARRAY_SIZE 16\n"
> +	"layout(location = 1) uniform float r;\n"
> +	"layout(location = 2) uniform float g;\n"
> +	"layout(location = 3) uniform float a[ARRAY_SIZE];\n"
> +	"layout(location = 19) uniform float b;\n"
> +	"void main() {\n"
> +		"gl_FragColor = vec4(r, g, b, a[ARRAY_SIZE - 1]);\n"
> +	"}";
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	GLuint prog, i;
> +
> +	piglit_require_extension("GL_ARB_explicit_uniform_location");
> +
> +	prog = piglit_build_simple_program(v_sha, f_sha);
> +
> +	/* verify that locations are sequential */
> +	for (i = 0; i < 16; i++) {
> +		char *element;
> +		if (asprintf(&element, "a[%d]", i) == -1)
> +			piglit_report_result(PIGLIT_FAIL);
> +
> +		if (glGetUniformLocation(prog, element) != 3 + i)
> +                   piglit_report_result(PIGLIT_FAIL);

Indentation looks a bit weird here. Other than the small nits:

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

By the way, have you tried these tests on any other hardware? It would always
be nice to know from the commit message if they did.

> +
> +		free(element);
> +	}
> +
> +	glDeleteProgram(prog);
> +	piglit_report_result(PIGLIT_PASS);
> +}
> -- 
> 1.8.3.1
>