[Piglit] [PATCH] Add test case to verify glClearBuffer support in display lists
Ian Romanick
idr at freedesktop.org
Wed Dec 21 15:00:21 PST 2011
On 12/19/2011 12:07 PM, Anuj Phogat wrote:
> it tests the display lists with glClearBufferfv() in GL_COMPILE and
> GL_COMPILE_AND_EXECUTE mode
>
> Signed-off-by: Anuj Phogat<anuj.phogat at gmail.com>
> ---
> This is an updated patch based on review comments by Ian Romanick.
> Let me know if i can still make it better.
>
> tests/all.tests | 1 +
> tests/spec/gl-3.0/api/CMakeLists.gl.txt | 1 +
> tests/spec/gl-3.0/api/clearbuffer-display-lists.c | 120 +++++++++++++++++++++
> 3 files changed, 122 insertions(+), 0 deletions(-)
> create mode 100644 tests/spec/gl-3.0/api/clearbuffer-display-lists.c
>
> diff --git a/tests/all.tests b/tests/all.tests
> index b713de0..86b0a46 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -806,6 +806,7 @@ spec['!OpenGL 3.0'] = gl30
> add_concurrent_test(gl30, 'bindfragdata-invalid-parameters')
> add_concurrent_test(gl30, 'clearbuffer-depth')
> add_concurrent_test(gl30, 'clearbuffer-depth-stencil')
> +add_concurrent_test(gl30, 'clearbuffer-display-lists')
> add_concurrent_test(gl30, 'clearbuffer-invalid-drawbuffer')
> add_concurrent_test(gl30, 'clearbuffer-invalid-buffer')
> add_concurrent_test(gl30, 'clearbuffer-stencil')
> diff --git a/tests/spec/gl-3.0/api/CMakeLists.gl.txt b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
> index 466ffeb..3ae18e3 100644
> --- a/tests/spec/gl-3.0/api/CMakeLists.gl.txt
> +++ b/tests/spec/gl-3.0/api/CMakeLists.gl.txt
> @@ -15,6 +15,7 @@ link_libraries (
> add_executable (bindfragdata-invalid-parameters bindfragdata-invalid-parameters.c)
> add_executable (clearbuffer-depth clearbuffer-common.c clearbuffer-depth.c)
> add_executable (clearbuffer-depth-stencil clearbuffer-common.c clearbuffer-depth-stencil.c)
> +add_executable (clearbuffer-display-lists clearbuffer-common.c clearbuffer-display-lists.c)
> add_executable (clearbuffer-invalid-drawbuffer clearbuffer-invalid-drawbuffer.c)
> add_executable (clearbuffer-invalid-buffer clearbuffer-invalid-buffer.c)
> add_executable (clearbuffer-stencil clearbuffer-common.c clearbuffer-stencil.c)
> diff --git a/tests/spec/gl-3.0/api/clearbuffer-display-lists.c b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c
> new file mode 100644
> index 0000000..e4874fa
> --- /dev/null
> +++ b/tests/spec/gl-3.0/api/clearbuffer-display-lists.c
> @@ -0,0 +1,120 @@
> +/* Copyright © 2011 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 clearbuffer-display-list.c
> + * Verify glClearBuffer functions are supported in display lists
> + *
> + * This test works by generating display lists with glClearBufferfv() in
> + * GL_COMPILE, GL_COMPILE_AND_EXECUTE modes and attempting to clear the color
> + * buffer using display lists
> + *
> + * \author Anuj Phogat
> + */
> +
> +#include "piglit-util.h"
> +#include "clearbuffer-common.h"
> +
> +void piglit_init(int argc, char **argv)
> +{
> + static const float first[4] = { 0.5, 0.4, 0.3, 1.0 };
> + static const float second[4] = { 0.8, 0.0, 0.8, 1.0 };
> + GLenum err;
> + bool pass = true;
> +
> + piglit_require_gl_version(30);
> + GLuint index = glGenLists(2);
To make the Windows builds happy, all declarations need to go before code.
> +
> + /* Generate a FBO with color render buffer attachment */
> + GLuint fb = generate_simple_fbo(true,
> + false,
> + false,
> + false);
> + if (fb == 0) {
> + if (!piglit_automatic) {
> + printf("Skipping framebuffer with color"
> + " attachment\n");
> + pass = false;
> + }
> + }
I don't think this test needs to do anything with an FBO. It can just
the regular framework. Right?
> + if (!piglit_automatic)
> + printf("Created framebuffer with a color"
> + " attachment\n");
> + /* Probe the color buffer befor creating display list */
before
> + pass = piglit_probe_rect_rgba(0, 0,
> + piglit_width, piglit_height,
> + default_color)
> + && pass;
> +
> + glNewList(index, GL_COMPILE);
> + glClearBufferfv(GL_COLOR,
> + 0,
> + first);
> + glEndList();
> + /* Probe the color buffer befor glCallList() */
> + pass = piglit_probe_rect_rgba(0, 0,
> + piglit_width, piglit_height,
> + default_color)
> + && pass;
> +
> + glCallList(index);
> +
> + err = glGetError();
> + if (err != GL_NO_ERROR) {
> + fprintf(stderr,
> + "First display list generated "
> + "a GL error (%s, 0x%04x)\n",
> + piglit_get_gl_error_name(err), err);
> + pass = false;
> + }
This (and the other glGetError checks) should use piglit_check_gl_error.
> + /* Probe the color buffer after glCallList() */
> + pass = piglit_probe_rect_rgba(0, 0,
> + piglit_width, piglit_height,
> + first)
> + && pass;
> +
> + /* Create a new list with compile and execute */
> + glNewList(index + 1, GL_COMPILE_AND_EXECUTE);
> + glClearBufferfv(GL_COLOR,
> + 0,
> + second);
> + glEndList();
> +
> + err = glGetError();
> + if (err != GL_NO_ERROR) {
> + fprintf(stderr,
> + "Second display list generated "
> + "a GL error (%s, 0x%04x)\n",
> + piglit_get_gl_error_name(err), err);
> + pass = false;
> + }
> +
> + /* Probe the color buffer after display list is executed */
> + pass = piglit_probe_rect_rgba(0, 0,
> + piglit_width, piglit_height,
> + second)
> + && pass;
> +
In addition, after this probe I'd clear the screen to a third color (and
probe) and execute the display list (and probe). We want to make sure
that COMPILE_AND_EXECUTE both executes and compiles. :)
> + glDeleteFramebuffers(1,&fb);
> + piglit_check_gl_error(GL_NO_ERROR, PIGLIT_FAIL);
> + piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
More information about the Piglit
mailing list