[Piglit] [PATCH 2/7] GL_ARB_draw_instanced/dlist: Test for error conditions.

[Eric Anholt]

Catches a bug in Mesa.
---
 tests/all.tests                                    |    1 +
 tests/spec/CMakeLists.txt                          |    1 +
 tests/spec/arb_draw_instanced/CMakeLists.txt       |    1 +
 .../arb_draw_instanced/execution/CMakeLists.gl.txt |   14 ++++
 .../arb_draw_instanced/execution/CMakeLists.txt    |    1 +
 tests/spec/arb_draw_instanced/execution/dlist.c    |   76 ++++++++++++++++++++
 6 files changed, 94 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_draw_instanced/CMakeLists.txt
 create mode 100644 tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
 create mode 100644 tests/spec/arb_draw_instanced/execution/CMakeLists.txt
 create mode 100644 tests/spec/arb_draw_instanced/execution/dlist.c

diff --git a/tests/all.tests b/tests/all.tests
index e4d56b8..fc447f7 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1024,6 +1024,7 @@ import_glsl_parser_tests(arb_draw_instanced,
 add_shader_test_dir(arb_draw_instanced,
                     testsDir + '/spec/arb_draw_instanced/execution',
                     recursive=True)
+arb_draw_instanced['dlist'] = concurrent_test('arb_draw_instanced-dlist')
 
 # Group ARB_fragment_program
 arb_fragment_program = Group()
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 1ff272a..a807374 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory (arb_color_buffer_float)
 add_subdirectory (arb_debug_output)
+add_subdirectory (arb_draw_instanced)
 add_subdirectory (arb_es2_compatibility)
 add_subdirectory (arb_framebuffer_object)
 add_subdirectory (arb_instanced_arrays)
diff --git a/tests/spec/arb_draw_instanced/CMakeLists.txt b/tests/spec/arb_draw_instanced/CMakeLists.txt
new file mode 100644
index 0000000..bb76f08
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory (execution)
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
new file mode 100644
index 0000000..af91509
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -0,0 +1,14 @@
+include_directories(
+	${OPENGL_INCLUDE_PATH}
+	${GLUT_INCLUDE_DIR}
+	${piglit_SOURCE_DIR}/tests/util
+)
+
+link_libraries (
+	piglitutil
+	${OPENGL_gl_LIBRARY}
+	${OPENGL_glu_LIBRARY}
+	${GLUT_glut_LIBRARY}
+)
+
+add_executable (arb_draw_instanced-dlist dlist.c)
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_draw_instanced/execution/dlist.c b/tests/spec/arb_draw_instanced/execution/dlist.c
new file mode 100644
index 0000000..f944ca4
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/dlist.c
@@ -0,0 +1,76 @@
+/*
+ * 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 display list behavior for GL_ARB_draw_instanced.
+ *
+ * From the spec:
+ *
+ *     "The error INVALID_OPERATION is generated if
+ *      DrawArraysInstancedARB or DrawElementsInstancedARB is called
+ *      during display list compilation."
+ */
+
+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)
+{
+	bool pass = true;
+	GLuint list;
+
+	piglit_require_extension("GL_ARB_draw_instanced");
+
+	list = glGenLists(1);
+	glNewList(list, GL_COMPILE);
+
+	glDrawArraysInstancedARB(GL_TRIANGLES, 0, 2, 3);
+	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+		pass = false;
+
+	glDrawElementsInstancedARB(GL_TRIANGLES, 2, GL_UNSIGNED_INT, NULL, 3);
+	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+		pass = false;
+
+	glEndList();
+
+	/* Make sure the list is empty. */
+	glCallList(list);
+	if (!piglit_check_gl_error(0))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.9.1