[Piglit] [PATCH 3/3] msaa: Test proper functioning when no color buffer is present.
Anuj Phogat
anuj.phogat at gmail.com
Tue Jul 17 11:35:22 PDT 2012
On Thu, Jul 12, 2012 at 5:53 PM, Paul Berry <stereotype441 at gmail.com> wrote:
> This test reproduces a problem in Mesa's i965 driver as of 7/12/12
> (commit 1a06e84): when no color buffer is present, but a multisampled
> depth or stencil buffer is present, Mesa fails to set up the rendering
> pipeline for multisampling.
>
> The test includes variants for testing both the stencil buffer and the
> depth buffer. The depth buffer test may be run in a "computed" mode,
> in which case the depth values are output by the fragment shader (this
> is an important corner case for i965).
>
> Verified on nVidia's proprietary binary driver for Linux.
> ---
> tests/all.tests | 9 +
> .../ext_framebuffer_multisample/CMakeLists.gl.txt | 1 +
> .../spec/ext_framebuffer_multisample/no-color.cpp | 232 ++++++++++++++++++++
> 3 files changed, 242 insertions(+), 0 deletions(-)
> create mode 100644 tests/spec/ext_framebuffer_multisample/no-color.cpp
>
> diff --git a/tests/all.tests b/tests/all.tests
> index b0c9355..46f6a9b 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -1473,6 +1473,15 @@ for num_samples in MSAA_SAMPLE_COUNTS:
> ext_framebuffer_multisample[test_name] = PlainExecTest(
> executable)
>
> +for num_samples in MSAA_SAMPLE_COUNTS:
> + for test_type in ('depth', 'depth-computed', 'stencil'):
> + for buffer_config in ('combined', 'separate', 'single'):
> + test_name = ' '.join(['no-color', str(num_samples),
> + test_type, buffer_config])
> + executable = 'ext_framebuffer_multisample-{0} -auto'.format(
> + test_name)
> + ext_framebuffer_multisample[test_name] = PlainExecTest(executable)
> +
> ext_framebuffer_object = Group()
> spec['EXT_framebuffer_object'] = ext_framebuffer_object
> add_fbo_stencil_tests(ext_framebuffer_object, 'GL_STENCIL_INDEX1')
> diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> index b2b7b51..027e4c5 100644
> --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
> @@ -28,6 +28,7 @@ piglit_add_executable (ext_framebuffer_multisample-negative-copyteximage negativ
> piglit_add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
> piglit_add_executable (ext_framebuffer_multisample-negative-mismatched-samples negative-mismatched-samples.c)
> piglit_add_executable (ext_framebuffer_multisample-negative-readpixels negative-readpixels.c)
> +piglit_add_executable (ext_framebuffer_multisample-no-color no-color.cpp common.cpp)
> piglit_add_executable (ext_framebuffer_multisample-point-smooth common.cpp point-smooth.cpp)
> piglit_add_executable (ext_framebuffer_multisample-polygon-smooth common.cpp polygon-smooth.cpp)
> piglit_add_executable (ext_framebuffer_multisample-polygon-stipple common.cpp polygon-stipple.cpp)
> diff --git a/tests/spec/ext_framebuffer_multisample/no-color.cpp b/tests/spec/ext_framebuffer_multisample/no-color.cpp
> new file mode 100644
> index 0000000..b7ded7c
> --- /dev/null
> +++ b/tests/spec/ext_framebuffer_multisample/no-color.cpp
> @@ -0,0 +1,232 @@
> +/*
> + * 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 no-color.cpp
> + *
> + * This test verifies proper operation of multisampled FBOs that lack
> + * a color buffer. It operates by performing identical draw
> + * operations in an FBO that lacks a color buffer and an FBO that has
> + * a color buffer, and verifying that the resulting output is the
> + * same.
> + *
> + * The test can run in any of the following modes:
> + *
> + * - depth: test depth buffer behaviour, using a fragment shader that
> + * does not compute depth.
> + *
> + * - depth-computed: test depth buffer behaviour, using a fragment
> + * shader that *does* compute depth.
> + *
> + * - stencil: test stencil buffer beahviour.
> + *
> + * It can also be configured to use either a combined depth/stencil
> + * buffer, separate depth/stencil buffers, or just a single
> + * depth/stencil buffer depending on the type of test.
> + *
> + * The test operates by performing the following steps:
> + *
> + * 1. Draw a test pattern to a multisampled FBO that lacks a color
> + * buffer (let's call this the "test FBO").
> + *
> + * 2. Blit the test pattern to a multisampled FBO that has a full
> + * complement of color, depth, and stencil buffers (let's call this
> + * the "manifest FBO").
> + *
> + * 3. Do a "manifest" operation to cause colors to be drawn that are
> + * dependent upon the contents of the depth or stencil buffer.
> + *
> + * 4. Blit the color buffer from the manifest FBO to the screen. This
> + * is the test image, and is shown in the left half of the piglit
> + * window.
> + *
> + * 5. Draw the test pattern again, but this time draw it directly to
> + * the manifest FBO.
> + *
> + * 6. Do a "manifest" operation again.
> + *
> + * 7. Blit the color buffer to the screen. This is the reference
> + * image, and is shown in the right half of the piglit window.
> + *
> + * 8. Compare the test and reference images to make sure they match.
> + */
> +
> +#include "common.h"
> +
> +PIGLIT_GL_TEST_MAIN(
> + 512 /* window_width */,
> + 256 /* window_height */,
> + GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA)
> +
> +namespace {
> +
> +const int pattern_width = 256, pattern_height = 256;
> +
> +GLenum buffer_to_test;
> +Fbo test_fbo;
> +Fbo manifest_fbo;
> +ManifestProgram *manifest_program;
> +TestPattern *test_pattern;
> +
> +void
> +print_usage_and_exit(char *prog_name)
> +{
> + printf("Usage: %s <num_samples> <test_type> <buffer_config?\n"
> + " where <test_type> is one of:\n"
> + " depth: test fixed pipeline depth\n"
> + " depth-computed: test depth value computed by a shader\n"
> + " stencil: test stencil\n"
> + " and <buffer_config> is one of:\n"
> + " combined: use a single combined depth/stencil buffer\n"
> + " separate: use separate depth and stencil buffers\n"
> + " single: use just a single buffer (depth or stencil)\n",
> + prog_name);
> + piglit_report_result(PIGLIT_FAIL);
> +}
> +
> +extern "C" void
> +piglit_init(int argc, char **argv)
> +{
> + if (argc != 4)
> + print_usage_and_exit(argv[0]);
> +
> + /* 1st arg: num_samples */
> + char *endptr = NULL;
> + int num_samples = strtol(argv[1], &endptr, 0);
> + if (endptr != argv[1] + strlen(argv[1]))
> + print_usage_and_exit(argv[0]);
> +
> + /* 2nd arg: test_type */
> + if (strcmp(argv[2], "depth") == 0) {
> + buffer_to_test = GL_DEPTH_BUFFER_BIT;
> + manifest_program = new ManifestDepth;
> + test_pattern = new DepthSunburst(false /* compute_depth */);
> + } else if (strcmp(argv[2], "depth-computed") == 0) {
> + buffer_to_test = GL_DEPTH_BUFFER_BIT;
> + manifest_program = new ManifestDepth;
> + test_pattern = new DepthSunburst(true /* compute_depth */);
> + } else if (strcmp(argv[2], "stencil") == 0) {
> + buffer_to_test = GL_STENCIL_BUFFER_BIT;
> + manifest_program = new ManifestStencil;
> + test_pattern = new StencilSunburst;
> + } else {
> + print_usage_and_exit(argv[0]);
> + }
> +
> + /* 3rd arg: buffer_config */
> + FboConfig test_fbo_config(num_samples, pattern_width, pattern_height);
> + test_fbo_config.color_internalformat = GL_NONE;
> + if (strcmp(argv[3], "combined") == 0) {
> + test_fbo_config.combine_depth_stencil = true;
> + } else if (strcmp(argv[3], "separate") == 0) {
> + test_fbo_config.combine_depth_stencil = false;
> + } else if (strcmp(argv[3], "single") == 0) {
> + test_fbo_config.combine_depth_stencil = false;
> + if (buffer_to_test == GL_DEPTH_BUFFER_BIT)
> + test_fbo_config.stencil_internalformat = GL_NONE;
> + else
> + test_fbo_config.depth_internalformat = GL_NONE;
> + } else {
> + print_usage_and_exit(argv[0]);
> + }
> +
> + piglit_require_gl_version(30);
> + piglit_require_GLSL_version(130);
> +
> + /* Skip the test if num_samples > GL_MAX_SAMPLES */
> + GLint max_samples;
> + glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
> + if (num_samples > max_samples)
> + piglit_report_result(PIGLIT_SKIP);
> +
> + test_fbo.setup(test_fbo_config);
> + manifest_fbo.setup(FboConfig(num_samples, pattern_width,
> + pattern_height));
> + manifest_program->compile();
> + test_pattern->compile();
> +
> + if (!piglit_check_gl_error(GL_NO_ERROR))
> + piglit_report_result(PIGLIT_FAIL);
> +}
> +
> +extern "C" enum piglit_result
> +piglit_display()
> +{
> + bool pass = true;
> +
> + /* Draw the test pattern into test_fbo. */
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, test_fbo.handle);
> + test_fbo.set_viewport();
> + test_pattern->draw(TestPattern::no_projection);
> +
> + /* Blit the test pattern to manifest_fbo. */
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, test_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, manifest_fbo.handle);
> + glBlitFramebuffer(0, 0, pattern_width, pattern_height,
> + 0, 0, pattern_width, pattern_height,
> + buffer_to_test, GL_NEAREST);
> +
> + /* Manifest the pattern so that it is reflected in color
> + * values in manifest_fbo.
> + */
> + manifest_program->run();
> +
> + /* Blit the color buffer from manifest_fbo to the screen.
> + * This is the test image.
> + */
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, manifest_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
> + glBlitFramebuffer(0, 0, pattern_width, pattern_height,
> + 0, 0, pattern_width, pattern_height,
> + GL_COLOR_BUFFER_BIT, GL_NEAREST);
> +
> + /* Draw the test pattern into manifest_fbo. */
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, manifest_fbo.handle);
> + manifest_fbo.set_viewport();
> + test_pattern->draw(TestPattern::no_projection);
> +
> + /* Manifest the pattern so that it is reflected in color
> + * values in manifest_fbo.
> + */
> + manifest_program->run();
> +
> + /* Blit the color buffer from manifest_fbo to the screen.
> + * This is the reference image.
> + */
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, manifest_fbo.handle);
> + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
> + glBlitFramebuffer(0, 0, pattern_width, pattern_height,
> + pattern_width, 0, 2*pattern_width, pattern_height,
> + GL_COLOR_BUFFER_BIT, GL_NEAREST);
> +
> + /* Compare the test and reference images */
> + glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
> + pass = piglit_probe_rect_halves_equal_rgba(0, 0, 2*pattern_width,
> + pattern_height) && pass;
> +
> + piglit_present_results();
> +
> + return pass ? PIGLIT_PASS : PIGLIT_FAIL;
> +}
> +
> +} /* Anonymous namespace */
> --
> 1.7.7.6
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
This series (Patch 1-3) is: Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
More information about the Piglit
mailing list