Now it's called "border-texture-finish".
---
tests/all.py | 2 +-
tests/bugs/CMakeLists.gl.txt | 1 -
tests/bugs/fdo20701.c | 94 ----------------------
.../spec/ext_framebuffer_object/CMakeLists.gl.txt | 1 +
.../ext_framebuffer_object/border-texture-finish.c | 94 ++++++++++++++++++++++
5 files changed, 96 insertions(+), 96 deletions(-)
delete mode 100644 tests/bugs/fdo20701.c
create mode 100644 tests/spec/ext_framebuffer_object/border-texture-finish.c
diff --git a/tests/all.py b/tests/all.py
index ef133ee..8226e4f 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -2978,7 +2978,6 @@ with profile.test_list.group_manager(
PiglitGLTest,
grouptools.join('spec', 'ext_framebuffer_object')) as g:
g(['fbo-generatemipmap-noimage'])
- g(['fdo20701'])
g(['fbo-1d'])
g(['fbo-3d'])
g(['fbo-alphatest-formats'])
@@ -3028,6 +3027,7 @@ with profile.test_list.group_manager(
g(['getteximage-formats', 'init-by-clear-and-render'])
g(['ext_framebuffer_multisample-fast-clear', 'single-sample'],
'fbo-fast-clear')
+ g(['ext_framebuffer_object-border-texture-finish'])
add_fbo_stencil_tests(g, 'GL_STENCIL_INDEX1')
add_fbo_stencil_tests(g, 'GL_STENCIL_INDEX4')
add_fbo_stencil_tests(g, 'GL_STENCIL_INDEX8')
diff --git a/tests/bugs/CMakeLists.gl.txt b/tests/bugs/CMakeLists.gl.txt
index 4804ae4..76272c7 100644
--- a/tests/bugs/CMakeLists.gl.txt
+++ b/tests/bugs/CMakeLists.gl.txt
@@ -10,7 +10,6 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
-piglit_add_executable (fdo20701 fdo20701.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 6f3c3f1..0000000
--- a/tests/bugs/fdo20701.c
+++ /dev/null
@@ -1,94 +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 <ian.d.roman...@intel.com>
- *
- */
-
-/**
- * \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;
- config.khr_no_error_support = PIGLIT_NO_ERRORS;
-
-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
index 4e3a07d..896f251 100644
--- a/tests/spec/ext_framebuffer_object/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_object/CMakeLists.gl.txt
@@ -8,6 +8,7 @@ link_libraries (
${OPENGL_gl_LIBRARY}
)
+piglit_add_executable (ext_framebuffer_object-border-texture-finish
border-texture-finish.c)
piglit_add_executable (ext_framebuffer_object-error-handling error-handling.c)
piglit_add_executable (ext_framebuffer_object-mipmap mipmap.c)
diff --git a/tests/spec/ext_framebuffer_object/border-texture-finish.c
b/tests/spec/ext_framebuffer_object/border-texture-finish.c
new file mode 100644
index 0000000..0cbf7c7
--- /dev/null
+++ b/tests/spec/ext_framebuffer_object/border-texture-finish.c
@@ -0,0 +1,94 @@
+/*
+ * 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 <ian.d.roman...@intel.com>
+ *
+ */
+
+/**
+ * \file border-texture-finish.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;
+ config.khr_no_error_support = PIGLIT_NO_ERRORS;
+
+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.7.4
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
