[Piglit] [PATCH 1/3] GL 3.2: Test functionality of GetBufferParameteri64v()

[Ian Romanick]

On 08/08/2013 01:42 PM, Nicholas Mack wrote:
> ---
>   tests/spec/gl-3.2/CMakeLists.gl.txt           |  1 +
>   tests/spec/gl-3.2/get-buffer-parameter-i64v.c | 91 +++++++++++++++++++++++++++
>   2 files changed, 92 insertions(+)
>   create mode 100644 tests/spec/gl-3.2/get-buffer-parameter-i64v.c
>
> diff --git a/tests/spec/gl-3.2/CMakeLists.gl.txt b/tests/spec/gl-3.2/CMakeLists.gl.txt
> index c6c99b8..bb0d008 100644
> --- a/tests/spec/gl-3.2/CMakeLists.gl.txt
> +++ b/tests/spec/gl-3.2/CMakeLists.gl.txt
> @@ -10,5 +10,6 @@ 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)
>
>   # vim: ft=cmake:
> diff --git a/tests/spec/gl-3.2/get-buffer-parameter-i64v.c b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c
> new file mode 100644
> index 0000000..d26efeb
> --- /dev/null
> +++ b/tests/spec/gl-3.2/get-buffer-parameter-i64v.c
> @@ -0,0 +1,91 @@
> +/**
> + * Copyright © 2012 Intel Corporation

It's 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 GetBufferParameteri64v()
> + *
> + * GL 3.2 core spec added GetBufferParameteri64v() in section 6.1.8
> + *
> + * GetBufferParameteri64v() returns an int64 value corresponding to the size, map
> + * offset, or map length 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;
> +}
> +
> +static GLenum buffers[] = { GL_ARRAY_BUFFER, GL_COPY_READ_BUFFER,
> +			GL_COPY_WRITE_BUFFER, GL_ELEMENT_ARRAY_BUFFER,
> +			GL_PIXEL_PACK_BUFFER, GL_PIXEL_UNPACK_BUFFER,
> +			GL_TEXTURE_BUFFER, GL_TRANSFORM_FEEDBACK_BUFFER,
> +			GL_UNIFORM_BUFFER };

static const GLenum buffers[] = ...

> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass = true;
> +	GLint64 data = -2;
> +	int i = 0;
> +
> +	int stuff[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
> +	int size = sizeof(stuff);
> +	int offset = 1;
> +	int range = 5;
> +
> +	GLuint buff = 0;
> +	glGenBuffers(1, &buff);
> +
> +	for (i = 0; i < sizeof(buffers)/sizeof(GLenum); i++) {
                         ARRAY_SIZE(buffers)

> +		glBindBuffer(buffers[i], buff);
> +		glBufferData(buffers[i], size, stuff, GL_STATIC_READ);
> +		glMapBufferRange(buffers[i], offset, range, GL_MAP_READ_BIT);
> +
> +		glGetBufferParameteri64v(buffers[i], GL_BUFFER_SIZE, &data);
> +		pass = piglit_check_gl_error(GL_NO_ERROR) && data == size && pass;

I think we should separate these checks out and log a message when data 
has the wrong value.  Otherwise you only get "fail" when the test fails, 
and you have to go dig through the test to figure out what went wrong. 
The test should just say "GL_BUFFER_SIZE returned XXX, but YYY was 
expected."

> +
> +		glGetBufferParameteri64v(buffers[i], GL_BUFFER_MAP_OFFSET, &data);
> +		pass = piglit_check_gl_error(GL_NO_ERROR) && data == offset && pass;
> +
> +		glGetBufferParameteri64v(buffers[i], GL_BUFFER_MAP_LENGTH, &data);
> +		pass = piglit_check_gl_error(GL_NO_ERROR) && data == range && pass;
> +	}
> +
> +	if (!piglit_check_gl_error(GL_NO_ERROR)) {
> +		pass = false;
> +	}

     pass = piglit_check_gl_error(GL_NO_ERROR) && pass;

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