[Piglit] [PATCH 7/7] Test GL_ARB_clear_texture using 1- and 2- component textures

[Brian Paul]

On 06/05/2014 09:38 AM, Neil Roberts wrote:
> This adds a test for glClearTexSubImage when clearing a sub-region of
> textures using an internal format of GL_RED and GL_RG.
> ---
>   tests/all.py                                   |  1 +
>   tests/spec/arb_clear_texture/CMakeLists.gl.txt |  1 +
>   tests/spec/arb_clear_texture/component.c       | 68 ++++++++++++++++++++++++++
>   3 files changed, 70 insertions(+)
>   create mode 100644 tests/spec/arb_clear_texture/component.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 8a46426..a28e5b8 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -3064,6 +3064,7 @@ add_concurrent_test(arb_clear_texture, 'arb_clear_texture-cube')
>   add_concurrent_test(arb_clear_texture, 'arb_clear_texture-base-formats')
>   add_concurrent_test(arb_clear_texture, 'arb_clear_texture-sized-formats')
>   add_concurrent_test(arb_clear_texture, 'arb_clear_texture-float')
> +add_concurrent_test(arb_clear_texture, 'arb_clear_texture-component')

Since this test is for red/green textures, maybe call this 
arb_clear_texture-rg?


>   add_concurrent_test(arb_clear_texture, 'arb_clear_texture-depth-stencil')
>
>   arb_copy_buffer = {}
> diff --git a/tests/spec/arb_clear_texture/CMakeLists.gl.txt b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> index 39c487d..505e0ff 100644
> --- a/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> +++ b/tests/spec/arb_clear_texture/CMakeLists.gl.txt
> @@ -14,6 +14,7 @@ piglit_add_executable (arb_clear_texture-cube cube.c)
>   piglit_add_executable (arb_clear_texture-base-formats base-formats.c common.c)
>   piglit_add_executable (arb_clear_texture-sized-formats sized-formats.c common.c)
>   piglit_add_executable (arb_clear_texture-float float.c common.c)
> +piglit_add_executable (arb_clear_texture-component component.c common.c)
>   piglit_add_executable (arb_clear_texture-depth-stencil depth-stencil.c common.c)
>
>   # vim: ft=cmake:
> diff --git a/tests/spec/arb_clear_texture/component.c b/tests/spec/arb_clear_texture/component.c
> new file mode 100644
> index 0000000..9d48f00
> --- /dev/null
> +++ b/tests/spec/arb_clear_texture/component.c
> @@ -0,0 +1,68 @@
> +/*
> + * Copyright (c) 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 float.c
> + *
> + * Test using glClearTexSubImage with red and red-green textures.
> + */
> +
> +#include "common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_compat_version = 13;
> +
> +	config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static const struct format
> +formats[] = {
> +        DEF_FORMAT(GL_RED, GL_RED, GL_UNSIGNED_BYTE, 1),
> +        DEF_FORMAT(GL_RG, GL_RG, GL_UNSIGNED_BYTE, 2),
> +};
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass;
> +
> +        /* RG textures are available in GL 3.0 or with the
> +	 * GL_ARB_texture_rg extension */

Comment indentation looks off.


> +	if (piglit_get_gl_version() < 30
> +	    && !piglit_is_extension_supported("GL_ARB_texture_rg")) {
> +		printf("OpenGL 3.0 or GL_ARB_texture_rg is required.\n");
> +		piglit_report_result(PIGLIT_SKIP);
> +	}
> +
> +	pass = test_formats(formats, sizeof formats / sizeof formats[0]);

ARRAY_SIZE macro.


> +
> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* unused */
> +	return PIGLIT_FAIL;
> +}
>