Add new test: ext_timer_query-lifetime

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.

Reviewed-by: Eric Anholt <eric@anholt.net>

3 files changed, 104 insertions, 0 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 3a40e083..11eecb54 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -1821,6 +1821,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 04af60f5..f7019ad0 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 00000000..557d6260
--- /dev/null
+++ b/tests/spec/ext_timer_query/lifetime.c
@@ -0,0 +1,101 @@
+/*
+ * 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 <ian.d.romanick@intel.com>
+ *    Carl Worth <cworth@cworth.org>
+ */
+
+/**
+ * \file lifetime.c
+ *
+ * Ensure that glIsQuery reports correct values throughout each stage
+ * of a timer query's lifetime.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+	config.supports_gl_compat_version = 10;
+
+	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 bool
+is_query_matches(GLuint query, GLboolean 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 false;
+	}
+
+	return true;
+}
+
+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);
+	piglit_draw_rect(0, 0, piglit_width, piglit_height);
+
+	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)
+{
+	piglit_require_extension("GL_ARB_timer_query");
+}