On 10/22/2013 06:48 AM, Topi Pohjolainen wrote:
> NVIDIA (319.60 on GTX 660) fails by reporting INVALID_OPERATION
> instead of INVALID_VALUE.
>
> Signed-off-by: Topi Pohjolainen <[email protected]>
> ---
> .../spec/arb_transform_feedback3/CMakeLists.gl.txt | 1 +
> .../query_with_invalid_index.c | 71
> ++++++++++++++++++++++
> 2 files changed, 72 insertions(+)
> create mode 100644
> tests/spec/arb_transform_feedback3/query_with_invalid_index.c
>
> diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> index 5d3608d..44b6229 100644
> --- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> @@ -13,5 +13,6 @@ piglit_add_executable
> (arb_transform_feedback3-ext_interleaved_single_gs_many_st
> piglit_add_executable (arb_transform_feedback3-ext_interleaved_two_bufs
> ext_interleaved_two_bufs.c)
> 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)
>
> # vim: ft=cmake:
> diff --git a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
> b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
> new file mode 100644
> index 0000000..314d126
> --- /dev/null
> +++ b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
> @@ -0,0 +1,71 @@
> +/*
> + * 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 invalid index given to BeginQueryIndexed(), EndQueryIndexed()
> or
> + * GetQueryIndexediv() is detected and an error is set. The spec says:
> + *
> + * "The error INVALID_VALUE is generated by BeginQueryIndexed,
> EndQueryIndexed
> + * or GetQueryIndexediv if <target> is TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN
> + * or PRIMITIVES_GENERATED and <index> is greater or equal
> + * to MAX_VERTEX_STREAMS."
> + */
> +
> +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)
> +{
> + GLuint queries[2];
> +
> + piglit_require_extension("GL_ARB_transform_feedback3");
> +
> + glGenQueries(ARRAY_SIZE(queries), queries);
> +
> + glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, 0, GL_MAX_VERTEX_STREAMS);
This test has the same problem as the previous.
> + if (!piglit_check_gl_error(GL_INVALID_VALUE))
> + piglit_report_result(PIGLIT_FAIL);
And tests should keep trying things after a non-fatal failure.
> +
> + glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, 0,
> + GL_MAX_VERTEX_STREAMS);
> + if (!piglit_check_gl_error(GL_INVALID_VALUE))
> + piglit_report_result(PIGLIT_FAIL);
> +
> + glDeleteQueries(ARRAY_SIZE(queries), queries);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> + /* Should never be reached */
> + return PIGLIT_FAIL;
> +}
>
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
