On 18 May 2012 16:56, 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"> This test varifies that GL_LINE_SMOOTH is ignored in case of multisample lines. Note: Smooth lines and multisampling seems to work fine but this test is failing on AMD catalyst drivers. Testing on NVIDIA could help. </blockquote><div> "line-smooth" passes on my nVidia system. </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 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 | 7 + .../ext_framebuffer_multisample/CMakeLists.gl.txt | 1 + .../ext_framebuffer_multisample/line-smooth.cpp | 189 ++++++++++++++++++++ 3 files changed, 197 insertions(+), 0 deletions(-) create mode 100644 tests/spec/ext_framebuffer_multisample/line-smooth.cpp diff --git a/tests/all.tests b/tests/all.tests index aaeb809..0332051 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1336,6 +1336,13 @@ for num_samples in (2, 4, 8, 16, 32): test_name) ext_framebuffer_multisample[test_name] = PlainExecTest(executable) +for num_samples in (2, 4, 8, 16, 32): + for buffer_type in ('color', 'depth', 'stencil'): + test_name = ' ' .join(['line-smooth', str(num_samples), buffer_type]) + 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 475237c..42be35b 100644 --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt @@ -13,6 +13,7 @@ link_libraries ( piglit_add_executable (ext_framebuffer_multisample-accuracy common.cpp accuracy.cpp) piglit_add_executable (ext_framebuffer_multisample-dlist dlist.c) +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) piglit_add_executable (ext_framebuffer_multisample-negative-copypixels negative-copypixels.c) diff --git a/tests/spec/ext_framebuffer_multisample/line-smooth.cpp b/tests/spec/ext_framebuffer_multisample/line-smooth.cpp new file mode 100644 index 0000000..d6c55c3 --- /dev/null +++ b/tests/spec/ext_framebuffer_multisample/line-smooth.cpp @@ -0,0 +1,189 @@ +/* + * 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 "common.h" + +/** + * \file line-smooth.cpp + * + * Page 128 (in the PDF) of the OpenGL 3.0 spec says: + * "If MULTISAMPLE is enabled, and the value of SAMPLE BUFFERS is one, + * then lines are rasterized using the following algorithm, regardless + * of whether line antialias-ing (LINE_SMOOTH) is enabled or disabled". + + * This test operates by drawing a test pattern with GL_LINE_SMOOTH + * disabled. Blit it in to right half of window system framebuffer. + * This is our reference image. + * + * Draw the same test pattern second time with GL_LINE_SMOOTH enabled + * in a multisample buffer. Blit it in to left half of window system + * framebuffer. This is our test image. + * + * To verify that GL_LINE_SMOOTH don't affect MSAA, compare the two + * halves of default framebuffer. They are expected to match. + * + */ +int piglit_width = 512; int piglit_height = 256; +int piglit_window_mode = + GLUT_DOUBLE | GLUT_RGBA | GLUT_ALPHA | GLUT_DEPTH | GLUT_STENCIL; + +const int pattern_width = 256; const int pattern_height = 256; + +Fbo test_fbo; +Fbo dst_fbo; +TestPattern *test_pattern = NULL; +ManifestProgram *manifest_program = NULL; +GLbitfield buffer_to_test; + +void +print_usage_and_exit(char *prog_name) +{ + printf("Usage: %s <num_samples> <buffer_type>\n" + " where <buffer_type> is one of:\n" + " color\n" + " stencil\n" + " depth\n", + prog_name); + piglit_report_result(PIGLIT_FAIL); +} </blockquote><div> It seems redundant to test smooth lines on color, depth, and stencil buffers, since line smoothing is part of rasterization, which applies uniformly to all attached buffers. Can we simplify this test to just test with a color buffer? </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + +void +piglit_init(int argc, char **argv) +{ + int num_samples; + if (argc < 3) + print_usage_and_exit(argv[0]); + { + char *endptr = NULL; + num_samples = strtol(argv[1], &endptr, 0); + if (endptr != argv[1] + strlen(argv[1])) + print_usage_and_exit(argv[0]); + } + + piglit_require_gl_version(30); + piglit_require_GLSL_version(130); + glClear(GL_COLOR_BUFFER_BIT); + + /* 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); + + if (strcmp(argv[2], "color") == 0) { + test_pattern = new Lines(); + buffer_to_test = GL_COLOR_BUFFER_BIT; + } else if (strcmp(argv[2], "depth") == 0) { + test_pattern = new DepthStar(); + manifest_program = new ManifestDepth(); + buffer_to_test = GL_DEPTH_BUFFER_BIT; + } else if (strcmp(argv[2], "stencil") == 0) { + test_pattern = new StencilStar(); + manifest_program = new ManifestStencil(); + buffer_to_test = GL_STENCIL_BUFFER_BIT; + } else { + print_usage_and_exit(argv[0]); + } + + test_pattern->compile(); + if (manifest_program) + manifest_program->compile(); + + test_fbo.init(num_samples, pattern_width, pattern_height, + true /* combine_depth_stencil */, + false /* attach_texture */); + + glEnable (GL_BLEND); + glBlendFunc (GL_SRC_ALPHA_SATURATE, GL_ONE); +} + +enum piglit_result +piglit_display() +{ + bool pass = true; + float proj[4][4] = { + { 1, 0, 0, 0 }, + { 0, 1, 0, 0 }, + { 0, 0, 1, 0 }, + { 0, 0, 0, 1 } }; + /* Draw test pattern in multisample test_fbo with GL_LINE_SMOOTH + * disabled. + */ + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, test_fbo.handle); + glClear(buffer_to_test); + test_fbo.set_viewport(); + test_pattern->draw(proj); + + /* Blit test_fbo to the right half of window system framebuffer. + * This is the reference image. + */ + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, test_fbo.handle); + test_fbo.set_viewport(); + if (manifest_program) + manifest_program->run(); + glBindFramebuffer(GL_READ_FRAMEBUFFER, test_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); + + /* Draw test pattern in mulisample test_fbo with GL_LINE_SMOOTH + * enabled + */ + glEnable(GL_LINE_SMOOTH); + glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); + glDisable (GL_DEPTH_TEST); </blockquote><div> Can you comment on why it's necessary to disable depth testing here? It's not immediately obvious to me. </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, test_fbo.handle); + test_fbo.set_viewport(); + test_pattern->draw(proj); + + glDisable(GL_LINE_SMOOTH); + + /* Now blit test_fbo to the left half of window system framebuffer. + * This is the test image. + */ + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, test_fbo.handle); + test_fbo.set_viewport(); + if (manifest_program) + manifest_program->run(); + glBindFramebuffer(GL_READ_FRAMEBUFFER, test_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); + + /* Check that the left and right halves of the screen match. If they + * don't, then GL_LINE_SMOOTH is not ignored with multisample + * rendering. + */ + glBindFramebuffer(GL_READ_FRAMEBUFFER, 0); + pass = piglit_probe_rect_halves_equal_rgba(0, 0, piglit_width, + piglit_height) && pass; + + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + + 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>