[Piglit] [v4 02/11] arb_transform_feedback3: add test for querying with invalid index

Topi Pohjolainen topi.pohjolainen at intel.com
Thu Nov 14 04:20:25 PST 2013


Passes on NVIDIA (304.88 on GTX 660) and on Ivy Bridge.

v2 (Ian):
   - ask the driver the maximum amount of streams supported
     instead of treating 'GL_MAX_VERTEX_STREAMS' as the value.
   - keep on trying the different combinations even if one of them
     fails.
   - try also maximum allowed for success
   - added to all.tests

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 tests/all.tests                                    |   1 +
 .../spec/arb_transform_feedback3/CMakeLists.gl.txt |   1 +
 .../query_with_invalid_index.c                     | 109 +++++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 tests/spec/arb_transform_feedback3/query_with_invalid_index.c

diff --git a/tests/all.tests b/tests/all.tests
index 8b4a042..03819c7 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2485,6 +2485,7 @@ for param in ['gl_NextBuffer-1', 'gl_NextBuffer-2', 'gl_SkipComponents1-1',
             'ext_transform_feedback-output-type {0}'.format(param))
 
 arb_transform_feedback3['arb_transform_feedback3-bind_buffer_invalid_index'] = PlainExecTest(['arb_transform_feedback3-bind_buffer_invalid_index', '-auto'])
+arb_transform_feedback3['arb_transform_feedback3-query_with_invalid_index'] = PlainExecTest(['arb_transform_feedback3-query_with_invalid_index', '-auto'])
 
 arb_uniform_buffer_object = Group()
 spec['ARB_uniform_buffer_object'] = arb_uniform_buffer_object
diff --git a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
index a149aee..e38b0d9 100644
--- a/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
+++ b/tests/spec/arb_transform_feedback3/CMakeLists.gl.txt
@@ -9,5 +9,6 @@ link_libraries (
 )
 
 piglit_add_executable (arb_transform_feedback3-bind_buffer_invalid_index bind_buffer_invalid_index.c)
+piglit_add_executable (arb_transform_feedback3-query_with_invalid_index query_with_invalid_index.c)
 
 # vim: ft=cmake:
diff --git a/tests/spec/arb_transform_feedback3/query_with_invalid_index.c b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
new file mode 100644
index 0000000..1279c8b
--- /dev/null
+++ b/tests/spec/arb_transform_feedback3/query_with_invalid_index.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2013 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 query_with_invalid_index.c
+ *
+ * Tests that invalid index given to BeginQueryIndexed(), EndQueryIndexed() or
+ * GetQueryIndexediv() is detected and an error is set. The spec says:
+ *
+ * "The error INVALID_VALUE is generated by BeginQueryIndexed, EndQueryIndexed
+ *  or GetQueryIndexediv if <target> is TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN
+ *  or PRIMITIVES_GENERATED and <index> is greater or equal
+ *  to MAX_VERTEX_STREAMS."
+ */
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 32;
+	config.supports_gl_core_version = 32;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+	/**
+	 * Separate queries for four different cases preventing the test from
+	 * re-using a query that got possibly activated by the previous attempt.
+	 *
+	 * generated with maximum
+	 * generated with maximum + 1
+	 * written with maximum
+	 * written with maximum + 1
+	 */
+	GLuint queries[4];
+	GLint max_streams;
+	bool pass = true;
+
+	piglit_require_extension("GL_ARB_transform_feedback3");
+
+	glGetIntegerv(GL_MAX_VERTEX_STREAMS, &max_streams);
+	if (!piglit_check_gl_error(GL_NO_ERROR)) {
+		printf("failed to resolve the maximum number of streams\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (max_streams <= 0) {
+		printf("invalid maximum number of streams: %d\n", max_streams);
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	glGenQueries(ARRAY_SIZE(queries), queries);
+
+	glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams - 1,
+			queries[0]);
+	if (!piglit_check_gl_error(GL_NO_ERROR)) {
+		printf("failed to activate primitives generated query for the "
+			"maximum supported stream\n");
+		pass = false;
+	}
+
+	glBeginQueryIndexed(GL_PRIMITIVES_GENERATED, max_streams, queries[1]);
+	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+
+	glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+			max_streams - 1, queries[2]);
+	if (!piglit_check_gl_error(GL_NO_ERROR)) {
+		printf("failed to activate primitives written query for the "
+			"maximum supported stream\n");
+		pass = false;
+	}
+
+	glBeginQueryIndexed(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+			max_streams, queries[3]);
+	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;
+
+	glDeleteQueries(ARRAY_SIZE(queries), queries);
+
+	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+	/* Should never be reached */
+	return PIGLIT_FAIL;
+}
-- 
1.8.3.1



More information about the Piglit mailing list