On 10/22/2013 06:48 AM, Topi Pohjolainen wrote:
> Passes on NVIDIA (319.60 on GTX 660).
>
> Signed-off-by: Topi Pohjolainen <[email protected]>
> ---
> tests/all.tests | 1 +
> .../spec/arb_transform_feedback3/CMakeLists.gl.txt | 1 +
> .../draw_using_invalid_stream_index.c | 67
> ++++++++++++++++++++++
> 3 files changed, 69 insertions(+)
> create mode 100644
> tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index 585e4a6..6e2fb2c 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -2358,6 +2358,7 @@
> arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_single_stream_m
>
> arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_single_gs_many_streams']
> =
> PlainExecTest(['arb_transform_feedback3-ext_interleaved_single_gs_many_streams',
> '-auto'])
>
> arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_draw_streams']
> = PlainExecTest(['arb_transform_feedback3-ext_interleaved_draw_streams',
> '-auto'])
> arb_transform_feedback3['arb_transform_feedback3-bind_buffer_invalid_index']
> = PlainExecTest(['arb_transform_feedback3-bind_buffer_invalid_index',
> '-auto'])
> +arb_transform_feedback3['arb_transform_feedback3-draw_using_invalid_stream_index']
> = PlainExecTest(['arb_transform_feedback3-draw_using_invalid_stream_index',
> '-auto'])
>
> for param in ['vs', 'gs', 'gs_max']:
>
> arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_two_bufs_vs']
> = PlainExecTest(['arb_transform_feedback3-ext_interleaved_two_bufs',
> '-auto', param])
> diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> index 9fe3017..ceb2cab 100644
> --- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> @@ -15,5 +15,6 @@ piglit_add_executable
> (arb_transform_feedback3-ext_interleaved_draw_streams ext_
> 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)
> +piglit_add_executable
> (arb_transform_feedback3-draw_using_invalid_stream_index
> draw_using_invalid_stream_index.c)
>
> # vim: ft=cmake:
> diff --git
> a/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
> b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
> new file mode 100644
> index 0000000..25d6bc1
> --- /dev/null
> +++ b/tests/spec/arb_transform_feedback3/draw_using_invalid_stream_index.c
> @@ -0,0 +1,67 @@
> +/*
> + * 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 draw_using_invalid_stream_index.c
> + *
> + * "The error INVALID_VALUE is generated by DrawTransformFeedbackStream
> + * if <stream> is greater than or equal to the value of 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 vao, tfb;
> + bool pass;
> +
> + /* Test is run under desktop OpenGL 3.2 -> use of VAOs is required */
> + glGenVertexArrays(1, &vao);
> + glBindVertexArray(vao);
> +
> + glGenTransformFeedbacks(1, &tfb);
> + glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, tfb);
> +
> + glDrawTransformFeedbackStream(GL_TRIANGLE_STRIP, tfb,
> + GL_MAX_VERTEX_STREAMS);
Are you sure this works on a core profile? It seems a little sketchy
that there's no program and no VBO. Does it still generate an error if
you set config.supports_gl_compat_version = 0 and pass a valid value for
stream parameter?
> +
> + pass = piglit_check_gl_error(GL_INVALID_VALUE);
> +
> + glDeleteTransformFeedbacks(1, &tfb);
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +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
