[Piglit] [PATCH 3/7] GL_ARB_draw_elements/dlist-arb_draw_instanced: Test for error conditions.

[Eric Anholt]

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

diff --git a/tests/all.tests b/tests/all.tests
index fc447f7..0531eda 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1006,6 +1006,7 @@ arb_es2_compatibility['FBO blit from missing attachment (ES2 completeness rules)
 # Group ARB_draw_elements_base_vertex
 arb_draw_elements_base_vertex = Group()
 spec['ARB_draw_elements_base_vertex'] = arb_draw_elements_base_vertex
+arb_draw_elements_base_vertex['dlist-arb_draw_instanced'] = concurrent_test('arb_draw_elements_base_vertex-dlist-arb_draw_instanced')
 add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex')
 arb_draw_elements_base_vertex['draw-elements-base-vertex-user_varrays'] = PlainExecTest(['draw-elements-base-vertex', '-auto', 'user_varrays'])
 add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex-neg')
diff --git a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
index ef5d4b0..07d47e7 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -12,5 +12,6 @@ link_libraries (
 )
 
 add_executable (draw-elements-instanced-base-vertex draw-elements-instanced-base-vertex.c)
+add_executable (arb_draw_elements_base_vertex-dlist-arb_draw_instanced dlist-arb_draw_instanced.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c
new file mode 100644
index 0000000..3f41e36
--- /dev/null
+++ b/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c
@@ -0,0 +1,92 @@
+/*
+ * 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-arb_draw_instanced.c
+ *
+ * Tests display list behavior for GL_ARB_draw_elements_base_vertex.
+ *
+ * From the GL_ARB_draw_elements_base_vertex spec:
+ *
+ *     "The commands
+ *         void DrawElementsBaseVertex(enum mode, sizei count, enum type,
+ *              void *indices, int basevertex);
+ *
+ *         void DrawRangeElementsBaseVertex(enum mode, uint start, uint end,
+ *              sizei count, enum type, void *indices, int basevertex);
+ *
+ *         void DrawElementsInstancedBaseVertex(enum mode, sizei count,
+ *              enum type, const void *indices, sizei primcount, int basevertex);
+ *
+ *      are equivalent to the commands with the same base name (without the
+ *      "BaseVertex" suffix) except that the <i>th element transferred by
+ *      the corresponding draw call will be taken from element
+ *         <indices>[<i>] + <basevertex>"
+ *
+ *
+ * From the GL_ARB_draw_instanced 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");
+	piglit_require_extension("GL_ARB_draw_elements_base_vertex");
+
+	list = glGenLists(1);
+	glNewList(list, GL_COMPILE);
+	if (!piglit_check_gl_error(0))
+		piglit_report_result(PIGLIT_FAIL);
+
+	glDrawElementsInstancedBaseVertex(GL_TRIANGLES, 2, GL_UNSIGNED_INT, NULL, 3, 0);
+	if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+		pass = false;
+
+	glEndList();
+
+	glCallList(list);
+	if (!piglit_check_gl_error(0))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.9.1