On 11 July 2012 16:18, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> When draw buffer zero is bound to an integer format buffer, GL_SAMPLE_ALPHA_TO_COVERAGE should have no effect. This should work properly even if there are other draw buffers that are not in integer format. Note: This test currently fails with Mesa on my Sandybridge system. </blockquote><div> Patches 3-5 are: Reviewed-by: Paul Berry <<a href="mailto:stereotype441@gmail.com">stereotype441@gmail.com</a>> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> --- tests/all.tests | 6 + .../ext_framebuffer_multisample/CMakeLists.gl.txt | 2 + .../int-draw-buffers-alpha-to-coverage.cpp | 131 ++++++++++++++++++++ 3 files changed, 139 insertions(+), 0 deletions(-) create mode 100644 tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp diff --git a/tests/all.tests b/tests/all.tests index 63d3994..06abfb0 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1449,6 +1449,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(['int-draw-buffers-alpha-to-coverage', 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 ad64321..81aa42e 100644 --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt @@ -26,6 +26,8 @@ piglit_add_executable (ext_framebuffer_multisample-formats common.cpp formats.cp piglit_add_executable (ext_framebuffer_multisample-interpolation common.cpp interpolation.cpp) piglit_add_executable (ext_framebuffer_multisample-int-draw-buffers-alpha-to-one common.cpp draw-buffers-common.cpp int-draw-buffers-alpha-to-one.cpp) +piglit_add_executable (ext_framebuffer_multisample-int-draw-buffers-alpha-to-coverage common.cpp + draw-buffers-common.cpp int-draw-buffers-alpha-to-coverage.cpp) piglit_add_executable (ext_framebuffer_multisample-line-smooth common.cpp line-smooth.cpp) piglit_add_executable (ext_framebuffer_multisample-minmax minmax.c) piglit_add_executable (ext_framebuffer_multisample-multisample-blit common.cpp multisample-blit.cpp) diff --git a/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp new file mode 100644 index 0000000..c197a83 --- /dev/null +++ b/tests/spec/ext_framebuffer_multisample/int-draw-buffers-alpha-to-coverage.cpp @@ -0,0 +1,131 @@ +/* + * 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 int-draw-buffers-alpha-to-coverage.cpp + * + * Verify sample alpha to coverage with integer draw buffers. + * + * When draw buffer zero is bound to an integer format buffer, + * GL_SAMPLE_ALPHA_TO_COVERAGE should have no effect. This should work + * properly even if there are other draw buffers that are not in integer + * format. + * + * This test operates by drawing a pattern in multisample FBO to generate + * reference and test images for all the draw buffers. Reference images are drawn + * to right half of window system draw buffer and test images to left half. + * + * Compare the left and right halves of window system frame buffer to verify + * the test image. + * + * Author: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>> + */ + +PIGLIT_GL_TEST_MAIN(512 /*window_width*/, + 768 /*window_height*/, + GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA) + +/* At present fragment shader in draw-buffers-common.cpp supports only + * fixed number of attachments = 3. + */ +static int num_attachments = 3; +static int samples; + +void +print_usage_and_exit(char *prog_name) +{ + printf("Usage: %s <num_samples>\n", prog_name); + piglit_report_result(PIGLIT_FAIL); +} + +void +piglit_init(int argc, char **argv) +{ + + if (argc < 2) + print_usage_and_exit(argv[0]); + { + char *endptr = NULL; + samples = strtol(argv[1], &endptr, 0); + if (endptr != argv[1] + strlen(argv[1])) + print_usage_and_exit(argv[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); + /* Testing of integer formats other than GL_RGBA8I is not supported + * by utility functions in draw-buffers-common.cpp. + */ + ms_fbo_and_draw_buffers_setup(samples, + pattern_width, + pattern_height, + num_attachments, + GL_RGBA8I); + 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(); + + draw_reference_image(true /* sample_alpha_to_coverage */, + false /* sample_alpha_to_one */); + + draw_test_image(true /* sample_alpha_to_coverage */, + false /* 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 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div>