This is similar to the recently added occlusion_query_lifetime test,
basically verifying that glQueryCounter (in addition to glBeginQuery)
is also sufficient for transitioning a generated query name into a
query object.
---
tests/all.tests | 1 +
tests/spec/ext_timer_query/CMakeLists.gl.txt | 2 +
tests/spec/ext_timer_query/lifetime.c | 110 ++++++++++++++++++++++++++
3 files changed, 113 insertions(+)
create mode 100644 tests/spec/ext_timer_query/lifetime.c
diff --git a/tests/all.tests b/tests/all.tests
index 4afa5ba..c85a03a 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1808,6 +1808,7 @@ add_plain_test(ext_timer_query, 'timer_query')
arb_timer_query = Group()
spec['ARB_timer_query'] = arb_timer_query
arb_timer_query['query GL_TIMESTAMP'] =
concurrent_test('ext_timer_query-time-elapsed timestamp')
+arb_timer_query['query-lifetime'] = concurrent_test('ext_timer_query-lifetime')
arb_timer_query['timestamp-get'] =
concurrent_test('arb_timer_query-timestamp-get')
ext_transform_feedback = Group()
diff --git a/tests/spec/ext_timer_query/CMakeLists.gl.txt
b/tests/spec/ext_timer_query/CMakeLists.gl.txt
index 04af60f..f7019ad 100644
--- a/tests/spec/ext_timer_query/CMakeLists.gl.txt
+++ b/tests/spec/ext_timer_query/CMakeLists.gl.txt
@@ -12,3 +12,5 @@ link_libraries (
IF (UNIX)
piglit_add_executable (ext_timer_query-time-elapsed time-elapsed.c)
ENDIF (UNIX)
+
+ piglit_add_executable (ext_timer_query-lifetime lifetime.c)
diff --git a/tests/spec/ext_timer_query/lifetime.c
b/tests/spec/ext_timer_query/lifetime.c
new file mode 100644
index 0000000..409e5b6
--- /dev/null
+++ b/tests/spec/ext_timer_query/lifetime.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2009,2012 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.
+ *
+ * Authors:
+ * Ian Romanick <[email protected]>
+ * Carl Worth <[email protected]>
+ */
+
+/**
+ * \file occlusion_query_lifetime.c
+ *
+ * Ensure that glIsQuery reports correct values throughout each stage
+ * of a query's lifetime.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = 20;
+ config.window_height = 20;
+ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE |
PIGLIT_GL_VISUAL_DEPTH;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+/* Check is glIsQuery() for 'query' returns 'expected'
+ */
+static int
+is_query_matches(GLuint query, int expected, const char *lifetime)
+{
+ int is_query = glIsQuery(query);
+
+ if (is_query != expected) {
+ printf("glIsQuery returned %d (expected %d) %s\n",
+ is_query, expected, lifetime);
+ return 0;
+ }
+
+ return 1;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ int test_pass = 1;
+ GLuint query;
+ GLint result;
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ /* Guaranteed to be random, see: http://xkcd.com/221
+ */
+ query = 3243;
+ test_pass &= is_query_matches(query, 0, "with un-generated name");
+
+ glGenQueries(1, &query);
+ test_pass &= is_query_matches(query, 0, "after glGenQueries");
+
+ glQueryCounter(query, GL_TIMESTAMP);
+ test_pass &= is_query_matches(query, 1, "after glQueryCounter");
+
+ /* Do a little drawing at least */
+ glColor3ub(0x00, 0xff, 0x00);
+ glBegin(GL_QUADS);
+ glVertex3f(0.0, 0.0, 0.0);
+ glVertex3f(piglit_width, 0.0, 0.0);
+ glVertex3f(piglit_width, piglit_height, 0.0);
+ glVertex3f(0.0, piglit_height, 0.0);
+ glEnd();
+
+ glGetQueryObjectiv(query, GL_QUERY_RESULT, &result);
+ test_pass &= is_query_matches(query, 1, "after glGetQueryObjectiv");
+
+ glDeleteQueries(1, &query);
+ test_pass &= is_query_matches(query, 0, "after glDeleteQueries");
+
+ piglit_present_results();
+
+ return test_pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLint query_bits;
+
+ piglit_require_extension("GL_ARB_timer_query");
+}
--
1.7.10.4
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
