[Piglit] [PATCH 4/7] GL_ARB_draw_instanced/negative-*: New tests for remaining error conditions.

Eric Anholt eric at anholt.net
Tue Feb 28 13:32:38 PST 2012


---
 tests/all.tests                                    |    2 +
 .../arb_draw_instanced/execution/CMakeLists.gl.txt |    2 +
 .../execution/negative-arrays-first-negative.c     |   60 +++++++++++++++
 .../execution/negative-elements-type.c             |   77 ++++++++++++++++++++
 4 files changed, 141 insertions(+), 0 deletions(-)
 create mode 100644 tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c
 create mode 100644 tests/spec/arb_draw_instanced/execution/negative-elements-type.c

diff --git a/tests/all.tests b/tests/all.tests
index 0531eda..916be38 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1026,6 +1026,8 @@ 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')
+arb_draw_instanced['negative-arrays-first-negative'] = concurrent_test('arb_draw_instanced-negative-arrays-first-negative')
+arb_draw_instanced['negative-elements-type'] = concurrent_test('arb_draw_instanced-negative-elements-type')
 
 # Group ARB_fragment_program
 arb_fragment_program = Group()
diff --git a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
index af91509..c7a94c8 100644
--- a/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
+++ b/tests/spec/arb_draw_instanced/execution/CMakeLists.gl.txt
@@ -12,3 +12,5 @@ link_libraries (
 )
 
 add_executable (arb_draw_instanced-dlist dlist.c)
+add_executable (arb_draw_instanced-negative-arrays-first-negative negative-arrays-first-negative.c)
+add_executable (arb_draw_instanced-negative-elements-type negative-elements-type.c)
diff --git a/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c
new file mode 100644
index 0000000..59fdc8e
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/negative-arrays-first-negative.c
@@ -0,0 +1,60 @@
+/*
+ * 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 negative-arrays-first-negative.c
+ *
+ * Tests error behavior for GL_ARB_draw_instanced.
+ *
+ * From the spec:
+ *
+ *     "INVALID_VALUE is generated by DrawArraysInstancedARB if
+ *      <first> is less than zero"
+ */
+
+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;
+
+	piglit_require_extension("GL_ARB_draw_instanced");
+
+	glDrawArraysInstancedARB(GL_TRIANGLES, -1, 2, 3);
+	if (!piglit_check_gl_error(GL_INVALID_VALUE))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
diff --git a/tests/spec/arb_draw_instanced/execution/negative-elements-type.c b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c
new file mode 100644
index 0000000..6b873bc
--- /dev/null
+++ b/tests/spec/arb_draw_instanced/execution/negative-elements-type.c
@@ -0,0 +1,77 @@
+/*
+ * 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 negative-elements-type.c
+ *
+ * Tests error behavior for GL_ARB_draw_instanced.
+ *
+ * From the spec:
+ *
+ *     "INVALID_ENUM is generated by DrawElementsInstancedARB if
+ *      <type> is not one of UNSIGNED_BYTE, UNSIGNED_SHORT or
+ *      UNSIGNED_INT."
+ */
+
+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;
+
+	piglit_require_extension("GL_ARB_draw_instanced");
+
+	glDrawArraysInstancedARB(GL_TRIANGLES, -1, 2, 3);
+	if (!piglit_check_gl_error(GL_INVALID_VALUE))
+		pass = false;
+
+	glDrawElementsInstancedARB(GL_TRIANGLES, 2, GL_INT, NULL, 3);
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	glDrawElementsInstancedARB(GL_TRIANGLES, 2, GL_SHORT, NULL, 3);
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	glDrawElementsInstancedARB(GL_TRIANGLES, 2, GL_BYTE, NULL, 3);
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	glDrawElementsInstancedARB(GL_TRIANGLES, 2, GL_FLOAT, NULL, 3);
+	if (!piglit_check_gl_error(GL_INVALID_ENUM))
+		pass = false;
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
-- 
1.7.9.1



More information about the Piglit mailing list