[Piglit] [PATCH 1/6] arb_transform_feedback3: add test for buffer binding with invalid index

[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>
> ---
>  tests/all.tests                                    |  1 +
>  .../spec/arb_transform_feedback3/CMakeLists.gl.txt |  1 +
>  .../bind_buffer_invalid_index.c                    | 74 ++++++++++++++++++++++
>  3 files changed, 76 insertions(+)
>  create mode 100644 tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
> 
> diff --git a/tests/all.tests b/tests/all.tests
> index b9f8b9c..585e4a6 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -2357,6 +2357,7 @@ arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_single_stream_m
>  arb_transform_feedback3['arb_transform_feedback3-ext_interleaved_single_stream_many_buffers_gs'] = PlainExecTest(['arb_transform_feedback3-ext_interleaved_single_stream_many_buffers', '-auto', 'gs'])
>  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'])
>  
>  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 337f53c..5d3608d 100644
> --- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> +++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
> @@ -12,5 +12,6 @@ piglit_add_executable (arb_transform_feedback3-ext_interleaved_single_stream_man
>  piglit_add_executable (arb_transform_feedback3-ext_interleaved_single_gs_many_streams ext_interleaved_single_gs_many_streams.c)
>  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)
>  
>  # vim: ft=cmake:
> diff --git a/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
> new file mode 100644
> index 0000000..18ecf78
> --- /dev/null
> +++ b/tests/spec/arb_transform_feedback3/bind_buffer_invalid_index.c
> @@ -0,0 +1,74 @@
> +/*
> + * 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 bind_buffer_invalid_index.c
> + *
> + * Tests that invalid index given to BindBufferRange() or BindBufferBase()
> + * is detected and an error is set. The spec says:
> + *
> + *  "The error INVALID_VALUE is generated by BindBufferRange,
> + *   BindBufferOffsetEXT, or BindBufferBase if <target> is
> + *   TRANSFORM_FEEDBACK_BUFFER and <index> is greater than or equal to the
> + *   value of MAX_TRANSFORM_FEEDBACK_BUFFERS."
> + */
> +
> +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 xfb;
> +
> +	piglit_require_extension("GL_ARB_transform_feedback3");
> +
> +	/* Set up the transform feedback buffers. */
> +	glGenBuffers(1, &xfb);
> +	glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER,
> +			GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, xfb);

While this is sure to be an invalid value (because it's 36464), I think
you want something like:

    GLint max_xfb_buffers;

    glGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, &max_xfb_buffers);


    /* Bind to the maximum supported buffer.  Should not generate an
     * error.
     */
    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER,
		max_xfb_buffers - 1, xfb);

    pass = piglit_check_gl_error(0) && pass;

    /* Unbind. */
    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER,
		max_xfb_buffers - 1, 0);


    /* Bind to one past the maximum supported buffer.  Should generate
     * an error.
     */
    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER,
		max_xfb_buffers, xfb);

    pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;

    ...

> +	if (!piglit_check_gl_error(GL_INVALID_VALUE))
> +		piglit_report_result(PIGLIT_FAIL);
> +
> +	glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER,
> +			GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, xfb, 0, 1);
> +	if (!piglit_check_gl_error(GL_INVALID_VALUE))
> +		piglit_report_result(PIGLIT_FAIL);
> +
> +	glDeleteBuffers(1, &xfb);
> +
> +	piglit_report_result(PIGLIT_PASS);
> +}
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* Should never be reached */
> +	return PIGLIT_FAIL;
> +}
>