[Piglit] [PATCH 1/7] EXT_framebuffer_multisample/dlist: New test for Mesa bug.

[Eric Anholt]

v2: Test that the command isn't compiled into the list, too.
---
 tests/all.tests                                    |    1 +
 .../ext_framebuffer_multisample/CMakeLists.gl.txt  |    1 +
 tests/spec/ext_framebuffer_multisample/dlist.c     |  104 ++++++++++++++++++++
 3 files changed, 106 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/ext_framebuffer_multisample/dlist.c

diff --git a/tests/all.tests b/tests/all.tests
index 7ca44e2..08b6b30 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1213,6 +1213,7 @@ arb_vertex_program['minmax'] = concurrent_test('arb_vertex_program-minmax')
 
 ext_framebuffer_multisample = Group()
 spec['EXT_framebuffer_multisample'] = ext_framebuffer_multisample
+ext_framebuffer_multisample['dlist'] = concurrent_test('ext_framebuffer_multisample-dlist')
 ext_framebuffer_multisample['negative-max-samples'] = concurrent_test('ext_framebuffer_multisample-negative-max-samples')
 ext_framebuffer_multisample['renderbuffer-samples'] = concurrent_test('ext_framebuffer_multisample-renderbuffer-samples')
 
diff --git a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
index b542c1d..ef61672 100644
--- a/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
+++ b/tests/spec/ext_framebuffer_multisample/CMakeLists.gl.txt
@@ -11,5 +11,6 @@ link_libraries (
 	${GLUT_glut_LIBRARY}
 )
 
+add_executable (ext_framebuffer_multisample-dlist dlist.c)
 add_executable (ext_framebuffer_multisample-negative-max-samples negative-max-samples.c)
 add_executable (ext_framebuffer_multisample-renderbuffer-samples renderbuffer-samples.c)
diff --git a/tests/spec/ext_framebuffer_multisample/dlist.c b/tests/spec/ext_framebuffer_multisample/dlist.c
new file mode 100644
index 0000000..08d47b2
--- /dev/null
+++ b/tests/spec/ext_framebuffer_multisample/dlist.c
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+#include "piglit-util.h"
+
+/**
+ * @file dlist.c
+ *
+ * Tests that glRenderbufferStorageMultisampleEXT is executed
+immediately instead of being compiled into display lists.
+ *
+ * From the EXT_framebuffer_multisample spec:
+ *
+ *     "Certain commands, when called while compiling a display list,
+ *      are not compiled into the display list but are executed
+ *      immediately.  These are: ...,
+ *      RenderbufferStorageMultisampleEXT..."
+ */
+
+int piglit_width = 32;
+int piglit_height = 32;
+int piglit_window_mode = GLUT_DOUBLE | GLUT_RGB | GLUT_ALPHA;
+
+enum piglit_result
+piglit_display(void)
+{
+	/* UNREACHED */
+	return PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+	GLint max_samples, rb_samples;
+	GLuint rb, list;
+	GLint width;
+	bool pass = true;
+
+	piglit_require_extension("GL_EXT_framebuffer_multisample");
+
+	glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+	if (!piglit_check_gl_error(0))
+		piglit_report_result(PIGLIT_FAIL);
+
+	glGenRenderbuffersEXT(1, &rb);
+	glBindRenderbufferEXT(GL_RENDERBUFFER, rb);
+
+	/* Make the list.  The Storage should be called during compile. */
+	list = glGenLists(1);
+	glNewList(list, GL_COMPILE);
+	glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
+					    max_samples,
+					    GL_RGBA,
+					    1, 1);
+	glEndList();
+
+	/* Make sure that the command occurred during the compile. */
+	glGetRenderbufferParameterivEXT(GL_RENDERBUFFER,
+					GL_RENDERBUFFER_SAMPLES,
+					&rb_samples);
+	if (rb_samples != max_samples) {
+		fprintf(stderr, "glRenderbufferStorageMultisampleEXT not called during "
+			"display list compile\n");
+		pass = false;
+	}
+
+
+	/* Now, make sure that it doesn't occur at execute.  Start
+	 * with storage of a different size so we can distinguish.
+	 */
+	glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
+					    max_samples,
+					    GL_RGBA,
+					    2, 2);
+
+	glCallList(list);
+	glGetRenderbufferParameterivEXT(GL_RENDERBUFFER,
+					GL_RENDERBUFFER_WIDTH,
+					&width);
+
+	glDeleteRenderbuffersEXT(1, &rb);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.7.3