<div dir="ltr">On 5 August 2013 15:13, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <div class="gmail_extra"><div class="gmail_quote"> <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This test verifies that same output is produced by scaled blitting of texture or renderbuffer color attachments with GL_LINEAR filter. It compares the output from following rendering scenarios: 1. Scaled blit using a single-sampled framebuffer with texture attachment. 2. Scaled blit using a single-sampled framebuffer with renderbuffer attachment. Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> --- tests/all.tests | 1 + .../ext_framebuffer_multisample/CMakeLists.gl.txt | 1 + .../attachments-blit-scaled-linear.cpp | 163 +++++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 tests/spec/ext_framebuffer_multisample/attachments-blit-scaled-linear.cpp diff --git a/tests/all.tests b/tests/all.tests index 07961b5..932f5ea 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -1101,6 +1101,7 @@ for format in ('rgba', 'depth', 'stencil'): add_plain_test(arb_framebuffer_object, 'fbo-alpha') add_plain_test(arb_framebuffer_object, 'fbo-blit-stretch') add_plain_test(arb_framebuffer_object, 'fbo-blit-scaled-linear') +add_plain_test(arb_framebuffer_object, 'attachments-blit-scaled-linear') </blockquote><div> </div><div>I think you mean add_plain_test(arb_framebuffer_object, 'fbo-attachments-blit-scaled-linear') </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> add_plain_test(arb_framebuffer_object, 'fbo-deriv') add_plain_test(arb_framebuffer_object, 'fbo-luminance-alpha') add_plain_test(arb_framebuffer_object, 'fbo-getframebufferattachmentparameter-01') diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt index db26758..cf8a164 100644 --- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt +++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt @@ -25,6 +25,7 @@ piglit_add_executable (ext_framebuffer_multisample-bitmap common.cpp bitmap.cpp) piglit_add_executable (ext_framebuffer_multisample-blit-flipped common.cpp blit-flipped.cpp) piglit_add_executable (ext_framebuffer_multisample-blit-scaled common.cpp blit-scaled.cpp) piglit_add_executable (fbo-blit-scaled-linear common.cpp blit-scaled-linear.cpp) +piglit_add_executable (fbo-attachments-blit-scaled-linear common.cpp attachments-blit-scaled-linear.cpp) </blockquote><div> </div><div>The comment I made on "Add test to verify the accuracy of scaled blitting with GL_LINEAR filter" applies here as well (I'd prefer to see the test pattern moved to tests/util, and then this test can go in the arb_framebuffer_object directory.) </div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> 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) piglit_add_executable (ext_framebuffer_multisample-blit-mismatched-formats common.cpp blit-mismatched-formats.cpp) diff --git a/tests/spec/ext_framebuffer_multisample/attachments-blit-scaled-linear.cpp b/tests/spec/ext_framebuffer_multisample/attachments-blit-scaled-linear.cpp new file mode 100644 index 0000000..bb4b2e5 --- /dev/null +++ b/tests/spec/ext_framebuffer_multisample/attachments-blit-scaled-linear.cpp @@ -0,0 +1,163 @@ +/* + * Copyright © 2013 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 attachments-blit-scaled-linear.cpp + * + * This test verifies that same output is produced by scaled blitting + * of texture or renderbuffer color attachments with GL_LINEAR filter. + * It compares the output from following rendering scenarios: + * 1. Scaled blit using a single-sampled framebuffer with texture attachment. + * 2. Scaled blit using a single-sampled framebuffer with renderbuffer + * attachment. + */ + +#include "common.h" +const int pattern_width = 258; const int pattern_height = 258; + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + + config.window_width = pattern_width * 2; + config.window_height = pattern_height; + config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA; + +PIGLIT_GL_TEST_CONFIG_END + +static TestPattern *test_pattern; +const int srcX0 = 6, srcY0 = 7, dstX0 = 0, dstY0 = 0; +const int srcX1 = pattern_width / 2, srcY1 = pattern_height / 2; +static Fbo fbo_tex, fbo_rb, fbo; + +void +piglit_init(int argc, char **argv) +{ + piglit_require_gl_version(21); + piglit_require_extension("GL_ARB_vertex_array_object"); + fbo.setup(FboConfig(0, 2 * pattern_width, pattern_height)); + /* Create two singlesample FBOs with same format and dimensions but + * different color attachment types. + */ + FboConfig Config(0, pattern_width, pattern_height); + Config.attach_texture = true; + fbo_tex.setup(Config); + Config.attach_texture = false; + fbo_rb.setup(Config); + + test_pattern = new Triangles(); + test_pattern->compile(); + + if (!piglit_check_gl_error(GL_NO_ERROR)) { + piglit_report_result(PIGLIT_FAIL); + } +} + +bool test_blit_scaled_linear() +{ + GLfloat scale; + GLint samples; + bool pass = true, result = true; + + /* Draw the test pattern into the framebuffer with texture + * attachment. + */ + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_tex.handle); + glViewport(0, 0, srcX1, srcY1); + glGetIntegerv(GL_SAMPLES, &samples); + glClear(GL_COLOR_BUFFER_BIT); + test_pattern->draw(TestPattern::no_projection); + + /* Blit the framebuffer with texture attachment into the + * framebuffer with renderbuffer attachment without scaling. + */ + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_tex.handle); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo_rb.handle); + glClear(GL_COLOR_BUFFER_BIT); + glBlitFramebuffer(0, 0, + fbo_tex.config.width, + fbo_tex.config.height, + 0, 0, + fbo_tex.config.width, + fbo_tex.config.height, + GL_COLOR_BUFFER_BIT, GL_NEAREST); + + for(scale = 0.1; scale < 2.5f; scale += 0.1) { + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo); + glClear(GL_COLOR_BUFFER_BIT); + + /* Do scaled blit of fbo_tex to left half of fbo */ + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_tex.handle); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo.handle); + glClearColor(0.0, 1.0, 0.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + glClearColor(0.0, 0.0, 0.0, 0.0); + glEnable(GL_SCISSOR_TEST); + glScissor(0, 0, pattern_width, pattern_height); + glBlitFramebuffer(srcX0, srcY0, + srcX1, srcY1, + dstX0, dstY0, + dstX0 + srcX1 * scale, dstY0 + srcY1 * scale, + GL_COLOR_BUFFER_BIT, + GL_LINEAR); + glDisable(GL_SCISSOR_TEST); + + /* Do scaled blit of fbo_rb to right half of fbo */ + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo_rb.handle); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo.handle); + glBlitFramebuffer(srcX0, srcY0, + srcX1, srcY1, + pattern_width + dstX0, dstY0, + pattern_width + dstX0 + srcX1 * scale, + dstY0 + srcY1 * scale, + GL_COLOR_BUFFER_BIT, + GL_LINEAR); + + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo.handle); + result = piglit_probe_rect_halves_equal_rgba(0, 0, + piglit_width, + piglit_height); + pass = result && pass; + + glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo.handle); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, piglit_winsys_fbo); + glBlitFramebuffer(0, 0, 2 * pattern_width, piglit_height, + 0, 0, 2 * pattern_width, piglit_height, + GL_COLOR_BUFFER_BIT, GL_NEAREST); + piglit_present_results(); + printf("scale = %f, result = %s\n", + scale, result ? "pass" : "fail"); + } + return pass; +} + +enum piglit_result +piglit_display() +{ + bool pass = true; + printf("Left Image: Linear scaled blit using texture attachment.\n" + "Right Image: Linear scaled blit using renderbuffer attachment.\n"); + pass = test_blit_scaled_linear() + && pass; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; +} -- 1.8.1.4 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org" target="_blank">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> </div></div>