[Piglit] [PATCH 3/6] arb_transform_feedback3: add test for ending non-active query

[Ian Romanick]

On 10/22/2013 06:48 AM, Topi Pohjolainen wrote:
> Passes on NVIDIA (319.60 on GTX 660).
> 
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

With the non-fatal failure issue fixed (same as on the previous two
patches), this one is

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

> ---
>  .../spec/arb_transform_feedback3/CMakeLists.gl.txt |  1 +
>  .../end_query_with_name_zero.c                     | 64 ++++++++++++++++++++++
>  2 files changed, 65 insertions(+)
>  create mode 100644 tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
> 
> diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> index 44b6229..9fe3017 100644
> --- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> @@ -14,5 +14,6 @@ piglit_add_executable (arb_transform_feedback3-ext_interleaved_two_bufs ext_inte
>  piglit_add_executable (arb_transform_feedback3-ext_interleaved_draw_streams ext_interleaved_draw_streams.c)
>  piglit_add_executable (arb_transform_feedback3-bind_buffer_invalid_index bind_buffer_invalid_index.c)
>  piglit_add_executable (arb_transform_feedback3-query_with_invalid_index query_with_invalid_index.c)
> +piglit_add_executable (arb_transform_feedback3-end_query_with_name_zero end_query_with_name_zero.c)
>  
>  # vim: ft=cmake:
> diff --git a/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
> new file mode 100644
> index 0000000..c36264b
> --- /dev/null
> +++ b/tests/spec/arb_transform_feedback3/end_query_with_name_zero.c
> @@ -0,0 +1,64 @@
> +/*
> + * Copyright © 2013 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.
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +/**
> + * @file query_with_invalid_index.c
> + *
> + * Tests that EndQueryIndexed() fails without corresponding call to
> + * BeginQueryIndexed(). The spec says:
> + *
> + * "The error INVALID_OPERATION is generated by EndQueryIndexed if the active
> + *  query object name at index <index> of target <target> is zero."
> + */
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_compat_version = 32;
> +	config.supports_gl_core_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	piglit_require_extension("GL_ARB_transform_feedback3");
> +
> +	glEndQueryIndexed(GL_PRIMITIVES_GENERATED, 0);
> +	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
> +		piglit_report_result(PIGLIT_FAIL);
> +
> +	glEndQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, 0);
> +	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
> +		piglit_report_result(PIGLIT_FAIL);
> +
> +	piglit_report_result(PIGLIT_PASS);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* Should never be reached */
> +	return PIGLIT_FAIL;
> +}
>