<div dir="ltr"> <div class="gmail_extra"> <div class="gmail_quote">On Wed, Apr 15, 2015 at 6:50 AM, Tapani Pälli <<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Test passes on Nvidia binary driver (version 346.35). Signed-off-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>> --- tests/all.py | 5 ++ tests/spec/CMakeLists.txt | 1 + .../CMakeLists.gl.txt | 12 +++ .../arb_framebuffer_no_attachments/CMakeLists.txt | 1 + tests/spec/arb_framebuffer_no_attachments/minmax.c | 96 ++++++++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100755 tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt create mode 100644 tests/spec/arb_framebuffer_no_attachments/CMakeLists.txt create mode 100644 tests/spec/arb_framebuffer_no_attachments/minmax.c diff --git a/tests/all.py b/tests/all.py index d3afdbe..18124b7 100755 --- a/tests/all.py +++ b/tests/all.py @@ -2291,6 +2291,11 @@ with profile.group_manager( g(['arb_program_interface_query-getprogramresourcename'], run_concurrent=False) g(['arb_program_interface_query-getprogramresourceiv'], run_concurrent=False) +with profile.group_manager( + PiglitGLTest, + grouptools.join('spec', 'ARB_framebuffer_no_attachments')) as g: + g(['arb_framebuffer_no_attachments-minmax'], run_concurrent=False) + # Group ARB_explicit_uniform_location with profile.group_manager( PiglitGLTest, diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt index 6ccf73d..330b38c 100644 --- a/tests/spec/CMakeLists.txt +++ b/tests/spec/CMakeLists.txt @@ -18,6 +18,7 @@ add_subdirectory (arb_es2_compatibility) add_subdirectory (arb_es3_compatibility) add_subdirectory (arb_explicit_attrib_location) add_subdirectory (arb_explicit_uniform_location) +add_subdirectory (arb_framebuffer_no_attachments) add_subdirectory (arb_framebuffer_object) add_subdirectory (arb_framebuffer_srgb) add_subdirectory (arb_geometry_shader4) diff --git a/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt new file mode 100755 index 0000000..894b95e --- /dev/null +++ b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.gl.txt @@ -0,0 +1,12 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (arb_framebuffer_no_attachments-minmax minmax.c) diff --git a/tests/spec/arb_framebuffer_no_attachments/CMakeLists.txt b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.txt new file mode 100644 index 0000000..4a012b9 --- /dev/null +++ b/tests/spec/arb_framebuffer_no_attachments/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() \ No newline at end of file diff --git a/tests/spec/arb_framebuffer_no_attachments/minmax.c b/tests/spec/arb_framebuffer_no_attachments/minmax.c new file mode 100644 index 0000000..a75e4c4 --- /dev/null +++ b/tests/spec/arb_framebuffer_no_attachments/minmax.c @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2015 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 minmax.c + * + * Test for the minimum and maximum values specified in the + * ARB_framebuffer_no_attachments extension. This test is written against + * OpenGL 2.0, for OpenGL < 4.2 spec states: + * + * "For implementations supporting this extension on older versions, the + * minimums can be determined from the table below. + * + * the minimum for is the minimum defined for + * ----------------------- -------------------------- + * MAX_FRAMEBUFFER_WIDTH MAX_TEXTURE_SIZE + * MAX_FRAMEBUFFER_HEIGHT MAX_TEXTURE_SIZE + * MAX_FRAMEBUFFER_LAYERS MAX_ARRAY_TEXTURE_LAYERS + * MAX_FRAMEBUFFER_SAMPLES MAX_SAMPLES + * " + */ + +#include "piglit-util-gl.h" +#include "minmax-test.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 20; + +PIGLIT_GL_TEST_CONFIG_END + +enum piglit_result +piglit_display(void) +{ + /* UNREACHED */ + return PIGLIT_FAIL; +} + +static void +test_min_int(GLenum value, GLenum min_value) +{ + GLint min; + glGetIntegerv(min_value, &min); </blockquote><div>Extra white space before glGetIntegerv.</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> + piglit_test_min_int(value, min); +} + +static void +texture_array_subtest() +{ + bool result; + if (!piglit_is_extension_supported("GL_EXT_texture_array")) + piglit_report_subtest_result(PIGLIT_SKIP, "layers"); + + test_min_int(GL_MAX_FRAMEBUFFER_LAYERS, GL_MAX_ARRAY_TEXTURE_LAYERS); + + result = piglit_minmax_pass ? PIGLIT_PASS : PIGLIT_FAIL; + + piglit_report_subtest_result(result, "layers"); +} + +void +piglit_init(int argc, char **argv) +{ + piglit_require_extension("GL_ARB_framebuffer_no_attachments"); </blockquote><div> OpenGL 3.0 or ARB_framebuffer_object is required.</div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"> + piglit_print_minmax_header(); + + test_min_int(GL_MAX_FRAMEBUFFER_WIDTH, GL_MAX_TEXTURE_SIZE); + test_min_int(GL_MAX_FRAMEBUFFER_HEIGHT, GL_MAX_TEXTURE_SIZE); + test_min_int(GL_MAX_FRAMEBUFFER_SAMPLES, GL_MAX_SAMPLES); + + texture_array_subtest(); + + if (!piglit_check_gl_error(GL_NO_ERROR)) + piglit_report_result(PIGLIT_FAIL); + + piglit_report_result(piglit_minmax_pass ? PIGLIT_PASS : PIGLIT_FAIL); +} -- 2.1.0 _______________________________________________ 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> </div><div class="gmail_extra">With above comments fixed:</div><div class="gmail_extra">Reviewed-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com">anuj.phogat@gmail.com</a>></div></div>