--- tests/bugs/CMakeLists.gl.txt | 3 +- tests/bugs/fdo20701.c | 93 ---------------------- .../spec/ext_framebuffer_object/CMakeLists.gl.txt | 14 ++++ tests/spec/ext_framebuffer_object/CMakeLists.txt | 1 + tests/spec/ext_framebuffer_object/fdo20701.c | 93 ++++++++++++++++++++++ 5 files changed, 109 insertions(+), 95 deletions(-) delete mode 100644 tests/bugs/fdo20701.c create mode 100644 tests/spec/ext_framebuffer_object/CMakeLists.gl.txt create mode 100644 tests/spec/ext_framebuffer_object/CMakeLists.txt create mode 100644 tests/spec/ext_framebuffer_object/fdo20701.c
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt index 78bc2d3..6481f82 100644 --- a/tests/bugs/CMakeLists.gl.txt +++ b/tests/bugs/CMakeLists.gl.txt @@ -14,10 +14,9 @@ link_libraries ( piglit_add_executable (crash-cubemap-order crash-cubemap-order.c) piglit_add_executable (crash-texparameter-before-teximage crash-texparameter-before-teximage.c) piglit_add_executable (drawbuffer-modes drawbuffer-modes.c) -piglit_add_executable (fdo10370 fdo10370.c) piglit_add_executable (r300-readcache r300-readcache.c) piglit_add_executable (tex1d-2dborder tex1d-2dborder.c) -piglit_add_executable (fdo20701 fdo20701.c) +piglit_add_executable (fdo10370 fdo10370.c) piglit_add_executable (point-sprite point-sprite.c) piglit_add_executable (fdo22540 fdo22540.c) piglit_add_executable (fdo23489 fdo23489.c) diff --git a/tests/bugs/fdo20701.c b/tests/bugs/fdo20701.c deleted file mode 100644 index b06d815..0000000 --- a/tests/bugs/fdo20701.c +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright © 2009 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. - * - * Authors: - * Ian Romanick <[email protected]> - * - */ - -/** - * \file fdo20701.c - * Test case from fd.o bug #20701 - * - * Configure an FBO for rendering to a color texture with border. Call - * glFinish while that FBO is bound. If it doesn't segfault, then the test - * passes. - */ - -#include "piglit-util-gl.h" - -PIGLIT_GL_TEST_CONFIG_BEGIN - - config.supports_gl_compat_version = 10; - - config.window_visual = PIGLIT_GL_VISUAL_RGB; - -PIGLIT_GL_TEST_CONFIG_END - -static GLuint fb; -static GLuint tex; - -enum piglit_result -piglit_display(void) -{ - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); - glClearColor(1.0, 0.0, 0.0, 1.0); - - glClear(GL_COLOR_BUFFER_BIT); - glFinish(); - - // If the test doesn't crash, then it passes. - return PIGLIT_PASS; -} - - -void -piglit_init(int argc, char**argv) -{ - GLenum status; - - piglit_require_extension("GL_EXT_framebuffer_object"); - - glGenFramebuffersEXT(1, &fb); - glGenTextures(1, &tex); - - glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 66, 66, 1, GL_RGBA, - GL_UNSIGNED_BYTE, NULL); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, tex, 0); - - status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { - printf("%s:%u: framebuffer status = 0x%04x\n", - __FUNCTION__, __LINE__, status); - if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) - piglit_report_result(PIGLIT_PASS); - else - piglit_report_result(PIGLIT_FAIL); - } -} diff --git a/tests/spec/ext_framebuffer_object/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_object/CMakeLists.gl.txt new file mode 100644 index 0000000..8ba28df --- /dev/null +++ b/tests/spec/ext_framebuffer_object/CMakeLists.gl.txt @@ -0,0 +1,14 @@ +include_directories( + ${GLEXT_INCLUDE_DIR} + ${OPENGL_INCLUDE_PATH} +) + +link_libraries ( + piglitutil_${piglit_target_api} + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} +) + +piglit_add_executable (fdo20701 fdo20701.c) + +# vim: ft=cmake: diff --git a/tests/spec/ext_framebuffer_object/CMakeLists.txt b/tests/spec/ext_framebuffer_object/CMakeLists.txt new file mode 100644 index 0000000..144a306 --- /dev/null +++ b/tests/spec/ext_framebuffer_object/CMakeLists.txt @@ -0,0 +1 @@ +piglit_include_target_api() diff --git a/tests/spec/ext_framebuffer_object/fdo20701.c b/tests/spec/ext_framebuffer_object/fdo20701.c new file mode 100644 index 0000000..b06d815 --- /dev/null +++ b/tests/spec/ext_framebuffer_object/fdo20701.c @@ -0,0 +1,93 @@ +/* + * Copyright © 2009 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. + * + * Authors: + * Ian Romanick <[email protected]> + * + */ + +/** + * \file fdo20701.c + * Test case from fd.o bug #20701 + * + * Configure an FBO for rendering to a color texture with border. Call + * glFinish while that FBO is bound. If it doesn't segfault, then the test + * passes. + */ + +#include "piglit-util-gl.h" + +PIGLIT_GL_TEST_CONFIG_BEGIN + + config.supports_gl_compat_version = 10; + + config.window_visual = PIGLIT_GL_VISUAL_RGB; + +PIGLIT_GL_TEST_CONFIG_END + +static GLuint fb; +static GLuint tex; + +enum piglit_result +piglit_display(void) +{ + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); + glClearColor(1.0, 0.0, 0.0, 1.0); + + glClear(GL_COLOR_BUFFER_BIT); + glFinish(); + + // If the test doesn't crash, then it passes. + return PIGLIT_PASS; +} + + +void +piglit_init(int argc, char**argv) +{ + GLenum status; + + piglit_require_extension("GL_EXT_framebuffer_object"); + + glGenFramebuffersEXT(1, &fb); + glGenTextures(1, &tex); + + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 66, 66, 1, GL_RGBA, + GL_UNSIGNED_BYTE, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb); + glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + GL_COLOR_ATTACHMENT0_EXT, + GL_TEXTURE_2D, tex, 0); + + status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { + printf("%s:%u: framebuffer status = 0x%04x\n", + __FUNCTION__, __LINE__, status); + if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) + piglit_report_result(PIGLIT_PASS); + else + piglit_report_result(PIGLIT_FAIL); + } +} -- 2.1.0 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
