[Piglit] [PATCH 08/15] arb_direct_state_access: Testing glClearNamedBufferSubData.

[Martin Peres]

On 23/01/15 21:03, Laura Ekstrand wrote:
> ---
>   tests/all.py                                       |   1 +
>   .../spec/arb_direct_state_access/CMakeLists.gl.txt |   1 +
>   .../clearnamedbuffersubdata-invalid-size.c         | 100 +++++++++++++++++++++
>   3 files changed, 102 insertions(+)
>   create mode 100644 tests/spec/arb_direct_state_access/clearnamedbuffersubdata-invalid-size.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 7fbadea..dee8b3b 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4425,6 +4425,7 @@ spec['ARB_direct_state_access']['texture-buffer-range'] = PiglitGLTest(['arb_dir
>   spec['ARB_direct_state_access']['namedbufferstorage-persistent'] = PiglitGLTest(['arb_direct_state_access-namedbufferstorage-persistent'], run_concurrent=True)
>   spec['ARB_direct_state_access']['namedbuffersubdata-vbo-sync'] = PiglitGLTest(['arb_direct_state_access-namedbuffersubdata-vbo-sync'], run_concurrent=True)
>   spec['ARB_direct_state_access']['clearnamedbufferdata-invalid-internal-format'] = PiglitGLTest(['arb_direct_state_access-clearnamedbufferdata-invalid-internal-format'], run_concurrent=True)
> +spec['ARB_direct_state_access']['clearnamedbuffersubdata-invalid-size'] = PiglitGLTest(['arb_direct_state_access-clearnamedbuffersubdata-invalid-size'], run_concurrent=True)
>   
>   profile.tests['hiz'] = hiz
>   profile.tests['fast_color_clear'] = fast_color_clear
> diff --git a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> index 6bdedbe..3afd698 100644
> --- a/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> +++ b/tests/spec/arb_direct_state_access/CMakeLists.gl.txt
> @@ -12,6 +12,7 @@ link_libraries (
>   piglit_add_executable (arb_direct_state_access-namedbufferstorage-persistent namedbufferstorage.c)
>   piglit_add_executable (arb_direct_state_access-namedbuffersubdata-vbo-sync namedbuffersubdata-vbo-sync.c)
>   piglit_add_executable (arb_direct_state_access-clearnamedbufferdata-invalid-internal-format clearnamedbufferdata-invalid-internal-format.c)
> +piglit_add_executable (arb_direct_state_access-clearnamedbuffersubdata-invalid-size clearnamedbuffersubdata-invalid-size.c)
>   piglit_add_executable (arb_direct_state_access-dsa-textures dsa-textures.c dsa-utils.c)
>   piglit_add_executable (arb_direct_state_access-texturesubimage texturesubimage.c)
>   piglit_add_executable (arb_direct_state_access-bind-texture-unit bind-texture-unit.c)
> diff --git a/tests/spec/arb_direct_state_access/clearnamedbuffersubdata-invalid-size.c b/tests/spec/arb_direct_state_access/clearnamedbuffersubdata-invalid-size.c
> new file mode 100644
> index 0000000..a1557c6
> --- /dev/null
> +++ b/tests/spec/arb_direct_state_access/clearnamedbuffersubdata-invalid-size.c
> @@ -0,0 +1,100 @@
> +/*
> + * Copyright © 2014, 2015 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.
> + */
> +
> +/**
> + * \file clearnamedbuffersubdata-invalid-size.c
> + *
> + * From the GL_ARB_clear_buffer_object spec:
> + * "If <offset> or <size> is less than zero, or if <offset> + <size> is greater
> + *  than the value of BUFFER_SIZE for the buffer bound to <target> then the
> + *  error INVALID_VALUE is generated."
> + * and
> + * "Both <offset> and <range> must be multiples of the number of basic machine
> + *  units per-element for that internal format specified by <internalformat>,
> + *  otherwise the error INVALID_VALUE is generated."
> + *
> + *  Adapted to test glClearNamedBufferSubData by Laura Ekstrand
> + *  <laura at jlekstrand.net>, January 2015.
> + */
> +
> +#include "piglit-util-gl.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_compat_version = 15;
> +	config.supports_gl_core_version = 31;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static GLuint buffer;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass = true;
> +	int i;
> +	const int buffer_size = 1<<20;
Do you really need to allocate 1 MB? 1 << 12 would make more sense (a page).

Also, can you add spaces?

Otherwise, looks good to me:

Reviewed-by: Martin Peres<martin.peres at linux.intel.com>

> +	static const char *const data_zero = "\x00\x00\x00\x00\x00\x00\x00\x00";
> +	ptrdiff_t ranges[][2] = {
> +		{-8, buffer_size},
> +		{16, -8},
> +		{buffer_size - 8, 16},
> +
> +		/* We're using GL_RGBA16 which is 8 bytes wide. */
> +		{4, 8},
> +		{8, 12},
> +	};
> +
> +	piglit_require_extension("GL_ARB_clear_buffer_object");
> +	piglit_require_extension("GL_ARB_direct_state_access");
> +
> +	/* Notice that I never bind the buffer. */
> +	glCreateBuffers(1, &buffer);
> +	glNamedBufferData(buffer, buffer_size, NULL, GL_STREAM_READ);
> +
> +	for (i = 0; i < ARRAY_SIZE(ranges); ++i) {
> +		bool error;
> +		pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +		printf("Testing ranges %d...\t", i);
> +		glClearNamedBufferSubData(buffer, GL_RGBA16, ranges[i][0],
> +					  ranges[i][1], GL_RGBA,
> +					  GL_UNSIGNED_SHORT, data_zero);
> +		error = piglit_check_gl_error(GL_INVALID_VALUE);
> +		printf("%s\n", error ? "Passed." : "Failed!");
> +		pass = error && pass;
> +	}
> +
> +	glDeleteBuffers(1, &buffer);
> +
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	return PIGLIT_PASS;
> +}
> +