[Piglit] [PATCH 08/12] msaa: Add test to verify sample-alpha-to-one with single sample FBO

Paul Berry stereotype441 at gmail.com
Tue Jul 17 11:49:44 PDT 2012


On 16 July 2012 15:56, Anuj Phogat <anuj.phogat at gmail.com> wrote:

> This test verifies that alpha values are not modified if
> GL_SAMPLE_ALPHA_TO_ONE is enabled and the buffer is single-sampled.
>
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  tests/all.tests                                    |    6 +
>  .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    2 +
>  .../alpha-to-one-single-sample-buffer.cpp          |  109
> ++++++++++++++++++++
>  3 files changed, 117 insertions(+), 0 deletions(-)
>  create mode 100644
> tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp
>
> diff --git a/tests/all.tests b/tests/all.tests
> index aeac4c1..27951bb 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1460,6 +1460,12 @@ for num_samples in MSAA_SAMPLE_COUNTS:
>          ext_framebuffer_multisample[test_name] = PlainExecTest(executable)
>
>  for num_samples in MSAA_SAMPLE_COUNTS:
> +        test_name = ' '.join(['alpha-to-one-single-sample-buffer',
> str(num_samples)])
> +        executable = 'ext_framebuffer_multisample-{0} -auto'.format(
> +                test_name)
> +        ext_framebuffer_multisample[test_name] = PlainExecTest(executable)
> +
> +for num_samples in MSAA_SAMPLE_COUNTS:
>          test_name = ' '.join(['bitmap', str(num_samples)])
>          executable = 'ext_framebuffer_multisample-{0} -auto'.format(
>                  test_name)
> diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> index e51dfc2..ee12e68 100644
> --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> @@ -12,6 +12,8 @@ link_libraries (
>  piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp
> accuracy.cpp)
>  piglit_add_executable
> (ext_framebuffer_multisample-alpha-to-one-msaa-disabled common.cpp
>                        draw-buffers-common.cpp
> alpha-to-one-msaa-disabled.cpp)
> +piglit_add_executable
> (ext_framebuffer_multisample-alpha-to-one-single-sample-buffer common.cpp
> +                      draw-buffers-common.cpp
> alpha-to-one-single-sample-buffer.cpp)
>  piglit_add_executable (ext_framebuffer_multisample-bitmap common.cpp
> bitmap.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)
> diff --git
> a/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp
> b/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp
> new file mode 100644
> index 0000000..9143e83
> --- /dev/null
> +++
> b/tests/spec/ext_framebuffer_multisample/alpha-to-one-single-sample-buffer.cpp
> @@ -0,0 +1,109 @@
> +/*
> + * 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.
> + */
> +
> +#include "draw-buffers-common.h"
> +
> +/**
> + * \file alpha-to-one-single-sample-buffer.cpp
> + *
> + * Verify that alpha values are not modified if GL_SAMPLE_ALPHA_TO_ONE
> + * is enabled and the buffer is single-sampled.
> + *
> + * This test operates by drawing a pattern in single sample FBO to
> generate
> + * a reference and test image. Reference imag is drawn to the right half
> of
> + * window system draw buffer and test image to the left half.
> + *
> + * Compare the left and right halves of window system frame buffer to
> verify
> + * the test image.
> + *
> + * Author: Anuj Phogat <anuj.phogat at gmail.com>
> + */
> +
> +PIGLIT_GL_TEST_MAIN(256 /*window_width*/,
> +                   256 /*window_height*/,
> +                   GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA)
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +       const int num_attachments = 1;
> +       /* For single sample buffer */
> +       const int samples = 0;
> +
> +       piglit_require_gl_version(30);
> +
> +       int pattern_width = piglit_width / 2;
> +       int pattern_height = piglit_height / num_attachments;
> +
> +       piglit_ortho_projection(pattern_width,
> +                               pattern_height,
> +                               GL_TRUE);
> +
> +       /* Skip the test if samples > GL_MAX_SAMPLES */
> +       GLint max_samples;
> +       glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
> +
> +       if (samples > max_samples)
> +               piglit_report_result(PIGLIT_SKIP);
>

This check isn't necessary since samples == 0.  With that fixed, this patch
is:

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


> +
> +       ms_fbo_and_draw_buffers_setup(samples,
> +                                     pattern_width,
> +                                     pattern_height,
> +                                     num_attachments,
> +                                     GL_COLOR_BUFFER_BIT,
> +                                     GL_RGBA);
> +       shader_compile();
> +}
> +
> +enum piglit_result
> +piglit_display()
> +{
> +       bool pass = true;
> +       glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
> +       glClearColor(0.0, 0.0, 0.0, 1.0);
> +       glClear(GL_COLOR_BUFFER_BIT);
> +       allocate_data_arrays();
> +
> +       /* Set sample_alpha_to_one = false to generate reference image */
> +       draw_reference_image(false /* sample_alpha_to_coverage */,
> +                            false /* sample_alpha_to_one */);
> +
> +       draw_test_image(false /* sample_alpha_to_coverage */,
> +                       true /* sample_alpha_to_one */);
> +
> +       pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +       glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
> +       pass = piglit_probe_rect_halves_equal_rgba(0, 0,
> +                                                  piglit_width,
> +                                                  piglit_height)
> +              && pass;
> +
> +       /* Free the memory allocated for data arrays */
> +       free_data_arrays();
> +
> +       if (!piglit_automatic)
> +               piglit_present_results();
> +
> +       return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> --
> 1.7.7.6
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20120717/0eb86ed1/attachment-0001.html>


More information about the Piglit mailing list