[Piglit] [PATCH 1/3] Add test to verify glBlitFramebuffer with non-matching sample count
Paul Berry
stereotype441 at gmail.com
Mon Jun 18 10:55:13 PDT 2012
On 18 June 2012 07:35, Anuj Phogat <anuj.phogat at gmail.com> wrote:
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
> tests/all.tests | 1 +
> .../ext_framebuffer_multisample/CMakeLists.gl.txt | 1 +
> .../blit-mismatched-samples.cpp | 89
> ++++++++++++++++++++
> 3 files changed, 91 insertions(+), 0 deletions(-)
> create mode 100644
> tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp
>
> diff --git a/tests/all.tests b/tests/all.tests
> index a004323..550d330 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1310,6 +1310,7 @@ arb_vertex_program['minmax'] =
> concurrent_test('arb_vertex_program-minmax')
>
> 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['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 1660067..146b80e 100644
> --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> @@ -10,6 +10,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-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-samples.cpp
> b/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp
> new file mode 100644
> index 0000000..9873f7f
> --- /dev/null
> +++ b/tests/spec/ext_framebuffer_multisample/blit-mismatched-samples.cpp
> @@ -0,0 +1,89 @@
> +/*
> + * 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-samples.cpp
> + *
> + * This test verifies if glBlitFramebuffer() throws GL_INVALID_OPERATION
> with
> + * non-matching samples in multisample framebuffer objects.
> + *
> + * We initialize two FBOs with different sample counts, do blitting
> operation
> + * 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;
> +
> +enum piglit_result
> +piglit_display()
> +{
> + bool pass = true;
> +
> + /* Blit multisample-to-multisample with non-matching sample count
> */
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, src_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, dst_fbo.handle);
> + glBlitFramebuffer(0, 0, pattern_width, pattern_height,
> + 0, 0, pattern_width, pattern_height,
> + GL_COLOR_BUFFER_BIT, GL_NEAREST);
> +
> + /* 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)
> +{
> + GLint samples, max_samples;
> + piglit_require_gl_version(30);
> +
> + /* OpenGL driver is supposed to round up the specified sample
> count to
> + * the next available sample count. So, this will create the FBO
> with
> + * minimum supported sample count.
> + */
> + src_fbo.setup(FboConfig(1 /* sample count */,
> + pattern_width,
> + pattern_height));
> +
> + glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
> +
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, src_fbo.handle);
> + glGetIntegerv(GL_SAMPLES, &samples);
> +
> + /* Skip the test if samples = GL_MAX_SAMPLES */
> + if (samples == max_samples)
> + piglit_report_result(PIGLIT_SKIP);
>
It might be nice to print a message before calling PIGLIT_SKIP that
explains why the test is skipping. (Maybe something like "the
implementation seems to support only one possible sample count").
> +
> + /* Creating FBO with (max_samples + 1) ensures that we get a
> different
> + * value of sample count in dst_fbo.
> + */
> + dst_fbo.setup(FboConfig(max_samples + 1, pattern_width,
> pattern_height));
>
I think you mean "samples + 1", not "max_samples + 1". max_samples + 1
asks for more samples than the implementation supports.
Also, I'd recommend adding something like this at the end of piglit_init():
if (!piglit_check_gl_error(GL_NO_ERROR)) {
printf("Error setting up fbos\n");
piglit_report_result(PIGLIT_FAIL);
}
Without it, there's a danger that an error in setting up the fbo's will be
mistaken for the expected blit error, and the test will appear to pass when
it actually fails.
> +}
> --
> 1.7.7.6
>
>
With those minor fixes, this patch is:
Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20120618/4753c195/attachment.html>
More information about the Piglit
mailing list