[Piglit] [PATCH v3] gles2: add fbo_discard_gles2 testcase

[Chad Versace]

Overall, this test looks good. But it should quote the "Errors" section
of the extension spec for the benefit of people who haven't recently
memorized the spec's minutiae.

That's my only comment.

On 02/13/2013 03:09 AM, Tapani Pälli wrote:
> tests GL_EXT_discard_framebuffer implementation
> 
> v2: changed to use piglit_check_gl_error instead of own macro
> v3: use correct enums, def_attach <-> usr_attach
> 
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>  tests/all.tests                          |   1 +
>  tests/spec/gles-2.0/CMakeLists.gles2.txt |   1 +
>  tests/spec/gles-2.0/fbo-discard.c        | 134 +++++++++++++++++++++++++++++++
>  3 files changed, 136 insertions(+)
>  create mode 100644 tests/spec/gles-2.0/fbo-discard.c
> 
> diff --git a/tests/all.tests b/tests/all.tests
> index 479b5b4..6288e20 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -2725,6 +2725,7 @@ gles20 = Group()
>  spec['!OpenGL ES 2.0'] = gles20
>  add_concurrent_test(gles20, 'invalid-es3-queries_gles2')
>  add_concurrent_test(gles20, 'minmax_gles2')
> +add_concurrent_test(gles20, 'fbo_discard_gles2')
>  
>  gles30 = Group()
>  spec['!OpenGL ES 3.0'] = gles30
> diff --git a/tests/spec/gles-2.0/CMakeLists.gles2.txt b/tests/spec/gles-2.0/CMakeLists.gles2.txt
> index cf91a71..d60dfda 100644
> --- a/tests/spec/gles-2.0/CMakeLists.gles2.txt
> +++ b/tests/spec/gles-2.0/CMakeLists.gles2.txt
> @@ -4,5 +4,6 @@ link_libraries(
>  
>  piglit_add_executable(invalid-es3-queries_gles2 invalid-es3-queries.c)
>  piglit_add_executable(minmax_gles2 minmax.c)
> +piglit_add_executable(fbo_discard_gles2 fbo-discard.c)
>  
>  # vim: ft=cmake:
> diff --git a/tests/spec/gles-2.0/fbo-discard.c b/tests/spec/gles-2.0/fbo-discard.c
> new file mode 100644
> index 0000000..80e0332
> --- /dev/null
> +++ b/tests/spec/gles-2.0/fbo-discard.c
> @@ -0,0 +1,134 @@
> +/*
> + * 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.
> + *
> + * Authors:
> + *    Tapani Pälli <tapani.palli at intel.com>
> + */
> +
> +/** @file fbo-discard.c
> + *
> + * Tests GL_EXT_discard_framebuffer implementation
> + *
> + * Test iterates over valid and invalid arguments and checks
> + * that the implementation returns correct error codes.
> + */
> +
> +#include "piglit-util-gl-common.h"
> +#include <EGL/egl.h>
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +	config.supports_gl_es_version = 20;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +static PFNGLDISCARDFRAMEBUFFEREXTPROC glDiscardFramebufferEXT;
> +
> +static GLboolean
> +run_test(void)
> +{
> +	bool pass = true;
> +	GLenum *p = NULL;
> +	GLuint fbo;
> +
> +	/* valid enums for user created fb */
> +	GLenum usr_attach[] = {
> +		GL_COLOR_ATTACHMENT0,
> +		GL_DEPTH_ATTACHMENT,
> +		GL_STENCIL_ATTACHMENT,
> +		0
> +	};
> +
> +	/* valid enums for default fb */
> +	GLenum def_attach[] = {
> +		GL_COLOR_EXT,
> +		GL_DEPTH_EXT,
> +		GL_STENCIL_EXT,
> +		0
> +	};
> +
> +	/* bonus invalid enum */
> +	const GLenum invalid[] = { GL_COMPILE_STATUS };
> +
> +	glGenFramebuffers(1, &fbo);
> +
> +	/* test with invalid target */
> +	glDiscardFramebufferEXT(GL_RENDERBUFFER, 1, usr_attach);
> +	pass &= piglit_check_gl_error(GL_INVALID_ENUM);
> +
> +	/* test with attachments < 0 */
> +	glDiscardFramebufferEXT(GL_FRAMEBUFFER, -1, usr_attach);
> +	pass &= piglit_check_gl_error(GL_INVALID_VALUE);
> +
> +	/* test with default fb */
> +	glBindFramebuffer(GL_FRAMEBUFFER, 0);
> +
> +	glDiscardFramebufferEXT(GL_FRAMEBUFFER, 3, def_attach);
> +	for(p = def_attach; *p != 0; p++)
> +		glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, p);
> +
> +	glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, invalid);
> +	pass &= piglit_check_gl_error(GL_INVALID_ENUM);
> +
> +	for(p = usr_attach; *p != 0; p++) {
> +		glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, p);
> +		pass &= piglit_check_gl_error(GL_INVALID_ENUM);
> +	}
> +
> +	/* test user created fb */
> +	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
> +
> +	glDiscardFramebufferEXT(GL_FRAMEBUFFER, 3, usr_attach);
> +	for(p = usr_attach; *p != 0; p++)
> +		glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, p);
> +
> +	glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, invalid);
> +	pass &= piglit_check_gl_error(GL_INVALID_ENUM);
> +
> +	for(p = def_attach; *p != 0; p++) {
> +		glDiscardFramebufferEXT(GL_FRAMEBUFFER, 1, p);
> +		pass &= piglit_check_gl_error(GL_INVALID_ENUM);
> +	}
> +
> +	return pass;
> +}
> +
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	GLboolean pass = run_test();
> +
> +	return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	piglit_require_extension("GL_EXT_discard_framebuffer");
> +
> +	glDiscardFramebufferEXT = (PFNGLDISCARDFRAMEBUFFEREXTPROC)
> +		eglGetProcAddress("glDiscardFramebufferEXT");
> +
> +	if (!glDiscardFramebufferEXT)
> +		piglit_report_result(PIGLIT_FAIL);
> +}
>