---
tests/all.py | 2 +-
.../CMakeLists.gl.txt | 2 +-
.../dlist-arb_draw_instanced.c | 96 --------------------
tests/spec/arb_draw_elements_base_vertex/dlist.c | 96 ++++++++++++++++++++
4 files changed, 98 insertions(+), 98 deletions(-)
delete mode 100644
tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c
create mode 100644 tests/spec/arb_draw_elements_base_vertex/dlist.c
diff --git a/tests/all.py b/tests/all.py
index ddbc6c1..c1d7d67 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1573,7 +1573,7 @@ add_plain_test(arb_depth_clamp, 'depth-clamp-status')
# Group ARB_draw_elements_base_vertex
arb_draw_elements_base_vertex = {}
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')
+arb_draw_elements_base_vertex['dlist'] =
concurrent_test('arb_draw_elements_base_vertex-dlist')
add_plain_test(arb_draw_elements_base_vertex, 'draw-elements-base-vertex')
arb_draw_elements_base_vertex['draw-elements-base-vertex-user_varrays'] =
PiglitTest(['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 8d73682..f649ece 100644
--- a/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_elements_base_vertex/CMakeLists.gl.txt
@@ -10,6 +10,6 @@ link_libraries (
)
piglit_add_executable (draw-elements-instanced-base-vertex
draw-elements-instanced-base-vertex.c)
-piglit_add_executable (arb_draw_elements_base_vertex-dlist-arb_draw_instanced
dlist-arb_draw_instanced.c)
+piglit_add_executable (arb_draw_elements_base_vertex-dlist dlist.c)
piglit_add_executable (multi-draw-elements-base-vertex
multi-draw-elements-base-vertex.c)
piglit_add_executable (draw-range-elements-base-vertex
draw-range-elements-base-vertex.c)
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
deleted file mode 100644
index 8f63adf..0000000
--- a/tests/spec/arb_draw_elements_base_vertex/dlist-arb_draw_instanced.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * 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-gl-common.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."
- */
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-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);
-}
diff --git a/tests/spec/arb_draw_elements_base_vertex/dlist.c
b/tests/spec/arb_draw_elements_base_vertex/dlist.c
new file mode 100644
index 0000000..8f63adf
--- /dev/null
+++ b/tests/spec/arb_draw_elements_base_vertex/dlist.c
@@ -0,0 +1,96 @@
+/*
+ * 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-gl-common.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."
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_visual = PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_RGBA;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+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.10.4
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
