fbo-finish-deleted: New test for firefox webgl debug-mode crashes.

3 files changed, 102 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 9f1bc8090..b621de844 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -138,6 +138,7 @@ add_plain_test(fbo, 'fbo-drawbuffers-maxtargets')
 add_plain_test(fbo, 'fbo-drawbuffers2-blend')
 add_plain_test(fbo, 'fbo-drawbuffers2-colormask')
 add_plain_test(fbo, 'fbo-draw-buffers-blend')
+add_plain_test(fbo, 'fbo-finish-deleted')
 add_plain_test(fbo, 'fbo-flushing')
 add_plain_test(fbo, 'fbo-fragcoord')
 add_plain_test(fbo, 'fbo-fragcoord2')
diff --git a/tests/fbo/CMakeLists.gl.txt b/tests/fbo/CMakeLists.gl.txt
index 1b359733d..442514c7a 100644
--- a/tests/fbo/CMakeLists.gl.txt
+++ b/tests/fbo/CMakeLists.gl.txt
@@ -41,6 +41,7 @@ add_executable (fbo-drawbuffers-maxtargets fbo-drawbuffers-maxtargets.c)
 add_executable (fbo-drawbuffers2-blend fbo-drawbuffers2-blend.c)
 add_executable (fbo-drawbuffers2-colormask fbo-drawbuffers2-colormask.c)
 add_executable (fbo-draw-buffers-blend fbo-draw-buffers-blend.c)
+add_executable (fbo-finish-deleted fbo-finish-deleted.c)
 add_executable (fbo-flushing fbo-flushing.c)
 add_executable (fbo-fragcoord fbo-fragcoord.c)
 add_executable (fbo-fragcoord2 fbo-fragcoord2.c)
diff --git a/tests/fbo/fbo-finish-deleted.c b/tests/fbo/fbo-finish-deleted.c
new file mode 100644
index 000000000..2a88993ac
--- /dev/null
+++ b/tests/fbo/fbo-finish-deleted.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2011 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 fbo-finish-deleted.c
+ *
+ * Tests that glFinish() on an FBO with recently deleted renderbuffers
+ * doesn't segfault.
+ *
+ * https://bugs.freedesktop.org/show_bug.cgi?id=34656
+ */
+
+#include "piglit-util.h"
+
+#define BUF_WIDTH 32
+#define BUF_HEIGHT 32
+int piglit_width = 32;
+int piglit_height = 32;
+int piglit_window_mode = GLUT_RGB;
+
+enum piglit_result
+piglit_display(void)
+{
+	return PIGLIT_PASS;
+}
+
+void piglit_init(int argc, char **argv)
+{
+	GLuint tex, fb;
+	GLenum status;
+	float green[4] = {0.0, 1.0, 0.0, 0.0};
+
+	piglit_require_extension("GL_EXT_framebuffer_object");
+
+	glGenTextures(1, &tex);
+	glBindTexture(GL_TEXTURE_2D, tex);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
+		     BUF_WIDTH, BUF_HEIGHT, 0,
+		     GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+	glGenFramebuffersEXT(1, &fb);
+	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
+	glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
+				  GL_COLOR_ATTACHMENT0_EXT,
+				  GL_TEXTURE_2D,
+				  tex,
+				  0);
+	assert(glGetError() == 0);
+	glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+
+	status = glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT);
+	if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+		fprintf(stderr, "framebuffer incomplete (status = 0x%04x)\n",
+			status);
+		piglit_report_result(PIGLIT_SKIP);
+	}
+
+	/* Draw something to get the driver's state all set up
+	 * pointing at our buffer.
+	 */
+	glColor4f(0.0, 1.0, 0.0, 0.0);
+	piglit_draw_rect(-1, -1, 2, 2);
+
+	piglit_probe_rect_rgba(0, 0, BUF_WIDTH, BUF_HEIGHT, green);
+
+	/* This glFinish() should work. */
+	glFinish();
+
+	glDeleteTextures(1, &tex);
+
+	/* This is the one that crashed. */
+	glFinish();
+
+	glDeleteFramebuffersEXT(1, &fb);
+
+	piglit_report_result(PIGLIT_PASS);
+
+}