[Piglit] [PATCH 2/3] GL 3.2: Test functionality of GetInteger64i_v()

[Ian Romanick]

On 08/08/2013 01:42 PM, Nicholas Mack wrote:
> ---
>   tests/spec/gl-3.2/CMakeLists.gl.txt  |  2 +-
>   tests/spec/gl-3.2/get-integer-64iv.c | 89 ++++++++++++++++++++++++++++++++++++
>   2 files changed, 90 insertions(+), 1 deletion(-)
>   create mode 100644 tests/spec/gl-3.2/get-integer-64iv.c
>
> diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
> index bb0d008..2add6bf 100644
> --- a/tests/spec/gl-3.2/CMakeLists.gl.txt
> +++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
> @@ -11,5 +11,5 @@ link_libraries (
>
>   piglit_add_executable (gl-3.2-minmax minmax.c)
>   piglit_add_executable (gl-3.2-get-buffer-parameter-i64v get-buffer-parameter-i64v.c)
> -
> +piglit_add_executable (gl-3.2-get-integer-64iv get-integer-64iv.c)
>   # vim: ft=cmake:
> diff --git a/tests/spec/gl-3.2/get-integer-64iv.c b/tests/spec/gl-3.2/get-integer-64iv.c
> new file mode 100644
> index 0000000..5f6fca4
> --- /dev/null
> +++ b/tests/spec/gl-3.2/get-integer-64iv.c
> @@ -0,0 +1,89 @@
> +/**
> + * Copyright © 2012 Intel Corporation

2013

> + *
> + * 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.
> + */
> +
> +/**
> + * Test GetInteger64i_v()
> + *
> + * GL 3.2 core spec added GetInteger64i_v() in section 6.1.1(Simple Queries)
> + *
> + * GetInteger64i_v() queries an int64 value corresponding to the size or
> + * offset of the target buffer
> + *
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_core_version = 32;
> +	config.supports_gl_compat_version = 32;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* UNREACHED */
> +	return PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass = true;
> +	GLint64 data = -2;
> +
> +	int size = 3 * sizeof(int);
> +	int offset = 0;
> +
> +	GLuint index = 0;
> +	GLuint buff = 0;
> +	glGenBuffers(1, &buff);
> +	glGenBuffers(1, &index);

You only need one buffer.  See below.

> +
> +	/* Test the UNIFORM_BUFFER */
> +	glBindBuffer(GL_UNIFORM_BUFFER, buff);
> +	glBindBufferRange(GL_UNIFORM_BUFFER, index, buff, offset, size);

There are a bunch of problems in these two lines.

The 'index' parameter to glBindBufferRange is "the index of the binding 
point within the array specified by target."  It's not another buffer 
object.  This should probably just be 0.  If we want to be exhaustive, 
we could query GL_MAX_UNIFORM_BUFFER_BINDINGS and try all of them. 
There's a similar query for GL_TRANSFORM_FEEDBACK_BUFFER, but I can't 
find it.

Even with that fixed, the glBindBufferRange call will fail. The size of 
the buffer is zero, so offset/size are out of range.  You need a call to 
glBufferData somewhere.

I think this code should

     glBindBuffer(GL_ARRAY_BUFFER, buf);
     glBufferData(GL_ARRAY_BUFFER, ...);

then have the loop that I mention below.

> +
> +	glGetInteger64i_v(GL_UNIFORM_BUFFER_START, index, &data);
> +	pass = (data == offset) && piglit_check_gl_error(GL_NO_ERROR) && pass;

Same comments here as the previous test.

> +	piglit_check_gl_error(GL_NO_ERROR);

Why are there extra, dangling calls to piglit_check_gl_error?

> +
> +	glGetInteger64i_v(GL_UNIFORM_BUFFER_SIZE, index, &data);
> +	pass = (data == size) && piglit_check_gl_error(GL_NO_ERROR) && pass;
> +	piglit_check_gl_error(GL_NO_ERROR);
> +
> +	/* Test the TRANSFORM_FEEDBACK_BUFFER */
> +	glBindBuffer(GL_TRANSFORM_FEEDBACK_BUFFER, buff);
> +	glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, index,
> +				buff, offset, size);
> +
> +	glGetInteger64i_v(GL_TRANSFORM_FEEDBACK_BUFFER_START, index, &data);
> +	pass = (data == offset) && piglit_check_gl_error(GL_NO_ERROR) && pass;
> +	piglit_check_gl_error(GL_NO_ERROR);
> +
> +	glGetInteger64i_v(GL_TRANSFORM_FEEDBACK_BUFFER_SIZE, index, &data);
> +	pass = (data == size) && piglit_check_gl_error(GL_NO_ERROR) && pass;
> +

It seems like this could be structured as a loop over an array of 
structures:

     static const struct {
         GLenum target, GLenum start, GLenum size;
     } test_vectors[] = {
         {
             GL_UNIFORM_BUFFER,
             GL_UNIFORM_BUFFER_START,
             GL_UNIFORM_BUFFER_SIZE
         },
         {
             GL_TRANSFORM_FEEDBACK_BUFFER,
             GL_TRANSFORM_FEEDBACK_BUFFER_START,
             GL_TRANSFORM_FEEDBACK_BUFFER_SIZE
         }
     };

     for (i = 0; i < ARRAY_SIZE(test_vectors); i++) {
         do_test(buf,
                 test_vectors[i].target,
                 test_vectors[i].start,
                 test_vectors[i].size);
     }

Using this structure will make it easier to add support for other 
indexed bindings (e.g., GL_ATOMIC_COUNTER_BUFFER) later.

> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
>