[Piglit] [PATCH 3/3] Add test to verify glBlitFramebuffer with non-matching buffer formats

[Paul Berry]

On 18 June 2012 07:37, Anuj Phogat <anuj.phogat at gmail.com> wrote:

> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
>

My same comment about calling piglit_check_gl_error() at the end of
piglit_init() applies to this patch too.


> ---
>  tests/all.tests                                    |    1 +
>  .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 +
>  .../blit-mismatched-formats.cpp                    |   95
> ++++++++++++++++++++
>  3 files changed, 97 insertions(+), 0 deletions(-)
>  create mode 100644
> tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp
>
> diff --git a/tests/all.tests b/tests/all.tests
> index ee6b22d..754a7e5 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1312,6 +1312,7 @@ ext_framebuffer_multisample = Group()
>  spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
>  ext_framebuffer_multisample['blit-mismatched-samples'] =
> concurrent_test('ext_framebuffer_multisample-blit-mismatched-samples')
>  ext_framebuffer_multisample['blit-mismatched-sizes'] =
> concurrent_test('ext_framebuffer_multisample-blit-mismatched-sizes')
> +ext_framebuffer_multisample['blit-mismatched-formats'] =
> concurrent_test('ext_framebuffer_multisample-blit-mismatched-formats')
>  ext_framebuffer_multisample['dlist'] =
> concurrent_test('ext_framebuffer_multisample-dlist')
>  ext_framebuffer_multisample['minmax'] =
> concurrent_test('ext_framebuffer_multisample-minmax')
>  ext_framebuffer_multisample['negative-copypixels'] =
> concurrent_test('ext_framebuffer_multisample-negative-copypixels')
> diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> index f4efa91..7e37787 100644
> --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> @@ -12,6 +12,7 @@ link_libraries (
>  piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp
> accuracy.cpp)
>  piglit_add_executable
> (ext_framebuffer_multisample-blit-mismatched-samples common.cpp
> blit-mismatched-samples.cpp)
>  piglit_add_executable (ext_framebuffer_multisample-blit-mismatched-sizes
> common.cpp blit-mismatched-sizes.cpp)
> +piglit_add_executable
> (ext_framebuffer_multisample-blit-mismatched-formats common.cpp
> blit-mismatched-formats.cpp)
>  piglit_add_executable (ext_framebuffer_multisample-dlist dlist.c)
>  piglit_add_executable (ext_framebuffer_multisample-formats common.cpp
> formats.cpp)
>  piglit_add_executable (ext_framebuffer_multisample-line-smooth common.cpp
> line-smooth.cpp)
> diff --git
> a/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp
> b/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp
> new file mode 100644
> index 0000000..3a4fdaa
> --- /dev/null
> +++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-formats.cpp
> @@ -0,0 +1,95 @@
> +/*
> + * Copyright © 2012 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 blit-mismatched-formats.cpp
> + *
> + * This test verifies if glBlitFramebuffer() throws GL_INVALID_OPERATION
> with
> + * non-matching formats for multisample framebuffer objects.
> + *
> + * We initialize two FBOs with minimum supported sample count and
> different
> + * buffer formats, do blitting operation between them and then query the
> gl
> + * error.
> + *
> + * Author: Anuj Phogat <anuj.phogat at gmail.com>
> + */
> +
> +#include "common.h"
> +
> +int piglit_width = 256; int piglit_height = 256;
> +int piglit_window_mode = GLUT_DOUBLE | GLUT_RGBA;
> +
> +const int pattern_width = 256; const int pattern_height = 256;
> +Fbo src_fbo, dst_fbo;
> +
> +static GLenum color_formats[] = {
> +       GL_RED,
> +       GL_RG,
> +       GL_RGB,
> +       GL_ALPHA};
>
+
> +enum piglit_result
> +piglit_display()
> +{
> +       bool pass = true;
> +       GLuint i;
> +
> +       FboConfig config_ms(1 , pattern_width, pattern_height);
> +
> +       for(i = 0; i < ARRAY_SIZE(color_formats); i++) {
> +               config_ms.color_internalformat = color_formats[i];
> +               src_fbo.setup(config_ms);
> +
> +               /* Blit multisample-to-multisample with non-matching
> formats */
> +               glBindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo.handle);
> +               glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst_fbo.handle);
>

I would recommend also calling piglit_check_gl_error() here, just to make
sure that an error didn't occur while setting up the formats.

With these two minor changes, this patch is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>


> +               glBlitFramebuffer(0, 0, pattern_width, pattern_height,
> +                                 0, 0, pattern_width, pattern_height,
> +                                 GL_COLOR_BUFFER_BIT, GL_NEAREST);
> +
> +               /* Blitting between different formats is not allowed for
> +                * multisample frambuffers. Here GL_INVALID_OPERATION is an
> +                * expected gl error.
> +                */
> +               pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass;
> +       }
> +
> +       return (pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +       piglit_require_gl_version(30);
> +
> +       /* Passing sample count = 1 will create the FBOs with minimum
> supported
> +        * sample count. Both FBOs are created with GL_RGBA format by
> default.
> +        */
> +       src_fbo.setup(FboConfig(1 /* sample count */,
> +                               pattern_width,
> +                               pattern_height));
> +
> +       dst_fbo.setup(FboConfig(1 /* sample count */,
> +                               pattern_width,
> +                               pattern_height));
> +}
> --
> 1.7.7.6
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20120618/1575ba5f/attachment.html>