[Piglit] [PATCH 1/7] Make new tests/spec/arb_occlusion_query directory
Carl Worth
cworth at cworth.org
Fri Dec 21 17:18:47 PST 2012
Moving the existing occlusion_query.c test from tests/general to the new
directory. This creates a natural place to add additional occlusion-query
tests according to the current naming scheme for piglit.
---
tests/general/CMakeLists.gl.txt | 1 -
tests/general/occlusion_query.c | 199 ----------------------
tests/spec/CMakeLists.txt | 1 +
tests/spec/arb_occlusion_query/CMakeLists.gl.txt | 12 ++
tests/spec/arb_occlusion_query/CMakeLists.txt | 1 +
tests/spec/arb_occlusion_query/occlusion_query.c | 199 ++++++++++++++++++++++
6 files changed, 213 insertions(+), 200 deletions(-)
delete mode 100644 tests/general/occlusion_query.c
create mode 100644 tests/spec/arb_occlusion_query/CMakeLists.gl.txt
create mode 100644 tests/spec/arb_occlusion_query/CMakeLists.txt
create mode 100644 tests/spec/arb_occlusion_query/occlusion_query.c
diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
index efaa56e..2e413ce 100644
--- a/tests/general/CMakeLists.gl.txt
+++ b/tests/general/CMakeLists.gl.txt
@@ -132,7 +132,6 @@ piglit_add_executable (vbo-subdata-sync vbo-subdata-sync.c)
piglit_add_executable (object_purgeable-api-pbo object_purgeable-api-pbo.c object_purgeable.c)
piglit_add_executable (object_purgeable-api-texture object_purgeable-api-texture.c object_purgeable.c)
piglit_add_executable (object_purgeable-api-vbo object_purgeable-api-vbo.c object_purgeable.c)
-piglit_add_executable (occlusion_query occlusion_query.c)
piglit_add_executable (occlusion-query-discard occlusion-query-discard.c)
piglit_add_executable (quad-invariance quad-invariance.c)
piglit_add_executable (clear-accum clear-accum.c)
diff --git a/tests/general/occlusion_query.c b/tests/general/occlusion_query.c
deleted file mode 100644
index ba35ed0..0000000
--- a/tests/general/occlusion_query.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright © 2009 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 at intel.com>
- */
-
-/**
- * \file occlusion_query.c
- * Simple test for GL_ARB_occlusion_query.
- */
-
-#include "piglit-util-gl-common.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
- config.supports_gl_compat_version = 10;
-
- config.window_width = 180;
- config.window_height = 100;
- config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-#define MAX_QUERIES 5
-static GLuint occ_queries[MAX_QUERIES];
-static PFNGLGENQUERIESPROC gen_queries = NULL;
-static PFNGLBEGINQUERYPROC begin_query = NULL;
-static PFNGLENDQUERYPROC end_query = NULL;
-static PFNGLGETQUERYIVPROC get_queryiv = NULL;
-static PFNGLGETQUERYOBJECTIVPROC get_query_objectiv = NULL;
-
-
-static void draw_box(float x, float y, float z, float w, float h)
-{
- glBegin(GL_QUADS);
- glVertex3f(x, y, z);
- glVertex3f(x + w, y, z);
- glVertex3f(x + w, y + h, z);
- glVertex3f(x, y + h, z);
- glEnd();
-}
-
-
-static int check_result(GLint passed, GLint expected)
-{
- printf("samples passed = %d, expected = %d\n", passed, expected);
- return (expected == passed) ? 1 : 0;
-}
-
-
-static int do_test(float x, int all_at_once)
-{
- static const struct {
- float x;
- float y;
- float z;
- float w;
- float h;
- int expected;
- GLubyte color[3];
- } tests[MAX_QUERIES] = {
- {
- 25.0f, 25.0f, 0.2f, 20.0f, 20.0f, 20 * 20,
- { 0x00, 0xff, 0x00 }
- },
- {
- 45.0f, 45.0f, -0.2f, 20.0f, 20.0f, 0,
- { 0x00, 0x7f, 0xf0 }
- },
- {
- 10.0f, 10.0f, -0.3f, 75.0f, 75.0f,
- (75 * 75) - (55 * 55),
- { 0x00, 0x00, 0xff }
- },
- {
- 20.0f, 20.0f, -0.1f, 55.0f, 55.0f, 0,
- { 0x7f, 0x7f, 0x00 }
- },
- {
- 50.0f, 25.0f, 0.2f, 20.0f, 20.0f, 20 * 20,
- { 0x00, 0x7f, 0xf0 }
- },
- };
- GLint passed;
- int test_pass = 1;
- unsigned i;
-
-
- /* Draw an initial red box that is 2500 pixels. All of the occlusion
- * query measurements are relative to this box.
- */
- glColor3ub(0xff, 0x00, 0x00);
- draw_box(x + 20.0f, 20.0f, 0.0f, 55.0f, 55.0f);
-
- for (i = 0; i < MAX_QUERIES; i++) {
- (*begin_query)(GL_SAMPLES_PASSED, occ_queries[i]);
- glColor3ubv(tests[i].color);
- draw_box(x + tests[i].x, tests[i].y, tests[i].z,
- tests[i].w, tests[i].h);
- (*end_query)(GL_SAMPLES_PASSED);
-
- if (! all_at_once) {
- (*get_query_objectiv)(occ_queries[i],
- GL_QUERY_RESULT, &passed);
- test_pass &= check_result(passed, tests[i].expected);
- }
- }
-
-
- if (all_at_once) {
- for (i = 0; i < MAX_QUERIES; i++) {
- (*get_query_objectiv)(occ_queries[i], GL_QUERY_RESULT,
- &passed);
- test_pass &= check_result(passed, tests[i].expected);
- }
- }
-
- printf("\n");
- return test_pass;
-}
-
-enum piglit_result
-piglit_display(void)
-{
- int test_pass;
-
- piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
- test_pass = do_test(0.0f, 0);
- test_pass &= do_test(85.0f, 1);
-
- piglit_present_results();
-
- return test_pass ? PIGLIT_PASS : PIGLIT_FAIL;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
- GLint query_bits;
-
- glClearColor(0.0, 0.2, 0.3, 0.0);
- glClearDepth(1.0);
-
- glEnable(GL_DEPTH_TEST);
- glDepthFunc(GL_LESS);
-
-
- if (piglit_get_gl_version() >= 15) {
- gen_queries = glGenQueries;
- begin_query = glBeginQuery;
- end_query = glEndQuery;
- get_queryiv = glGetQueryiv;
- get_query_objectiv = glGetQueryObjectiv;
- } else if (piglit_is_extension_supported("GL_ARB_occlusion_query")) {
- gen_queries = glGenQueriesARB;
- begin_query = glBeginQueryARB;
- end_query = glEndQueryARB;
- get_queryiv = glGetQueryivARB;
- get_query_objectiv = glGetQueryObjectivARB;
- } else {
- piglit_report_result(PIGLIT_SKIP);
- }
-
-
- /* It is legal for a driver to support the query API but not have
- * any query bits. I wonder how many applications actually check for
- * this case...
- */
- (*get_queryiv)(GL_SAMPLES_PASSED, GL_QUERY_COUNTER_BITS,
- & query_bits);
- if (query_bits == 0) {
- piglit_report_result(PIGLIT_SKIP);
- }
-
-
- (*gen_queries)(MAX_QUERIES, occ_queries);
-}
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index c2a7886..b233601 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory (arb_instanced_arrays)
add_subdirectory (arb_map_buffer_alignment)
add_subdirectory (arb_map_buffer_range)
add_subdirectory (arb_multisample)
+add_subdirectory (arb_occlusion_query)
add_subdirectory (arb_occlusion_query2)
add_subdirectory (arb_robustness)
add_subdirectory (arb_sampler_objects)
diff --git a/tests/spec/arb_occlusion_query/CMakeLists.gl.txt b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt
new file mode 100644
index 0000000..a323e86
--- /dev/null
+++ b/tests/spec/arb_occlusion_query/CMakeLists.gl.txt
@@ -0,0 +1,12 @@
+include_directories(
+ ${GLEXT_INCLUDE_DIR}
+ ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+ piglitutil_${piglit_target_api}
+ ${OPENGL_gl_LIBRARY}
+ ${OPENGL_glu_LIBRARY}
+)
+
+piglit_add_executable (occlusion_query occlusion_query.c)
diff --git a/tests/spec/arb_occlusion_query/CMakeLists.txt b/tests/spec/arb_occlusion_query/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/spec/arb_occlusion_query/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/arb_occlusion_query/occlusion_query.c b/tests/spec/arb_occlusion_query/occlusion_query.c
new file mode 100644
index 0000000..ba35ed0
--- /dev/null
+++ b/tests/spec/arb_occlusion_query/occlusion_query.c
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2009 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 at intel.com>
+ */
+
+/**
+ * \file occlusion_query.c
+ * Simple test for GL_ARB_occlusion_query.
+ */
+
+#include "piglit-util-gl-common.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+ config.supports_gl_compat_version = 10;
+
+ config.window_width = 180;
+ config.window_height = 100;
+ config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE | PIGLIT_GL_VISUAL_DEPTH;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+#define MAX_QUERIES 5
+static GLuint occ_queries[MAX_QUERIES];
+static PFNGLGENQUERIESPROC gen_queries = NULL;
+static PFNGLBEGINQUERYPROC begin_query = NULL;
+static PFNGLENDQUERYPROC end_query = NULL;
+static PFNGLGETQUERYIVPROC get_queryiv = NULL;
+static PFNGLGETQUERYOBJECTIVPROC get_query_objectiv = NULL;
+
+
+static void draw_box(float x, float y, float z, float w, float h)
+{
+ glBegin(GL_QUADS);
+ glVertex3f(x, y, z);
+ glVertex3f(x + w, y, z);
+ glVertex3f(x + w, y + h, z);
+ glVertex3f(x, y + h, z);
+ glEnd();
+}
+
+
+static int check_result(GLint passed, GLint expected)
+{
+ printf("samples passed = %d, expected = %d\n", passed, expected);
+ return (expected == passed) ? 1 : 0;
+}
+
+
+static int do_test(float x, int all_at_once)
+{
+ static const struct {
+ float x;
+ float y;
+ float z;
+ float w;
+ float h;
+ int expected;
+ GLubyte color[3];
+ } tests[MAX_QUERIES] = {
+ {
+ 25.0f, 25.0f, 0.2f, 20.0f, 20.0f, 20 * 20,
+ { 0x00, 0xff, 0x00 }
+ },
+ {
+ 45.0f, 45.0f, -0.2f, 20.0f, 20.0f, 0,
+ { 0x00, 0x7f, 0xf0 }
+ },
+ {
+ 10.0f, 10.0f, -0.3f, 75.0f, 75.0f,
+ (75 * 75) - (55 * 55),
+ { 0x00, 0x00, 0xff }
+ },
+ {
+ 20.0f, 20.0f, -0.1f, 55.0f, 55.0f, 0,
+ { 0x7f, 0x7f, 0x00 }
+ },
+ {
+ 50.0f, 25.0f, 0.2f, 20.0f, 20.0f, 20 * 20,
+ { 0x00, 0x7f, 0xf0 }
+ },
+ };
+ GLint passed;
+ int test_pass = 1;
+ unsigned i;
+
+
+ /* Draw an initial red box that is 2500 pixels. All of the occlusion
+ * query measurements are relative to this box.
+ */
+ glColor3ub(0xff, 0x00, 0x00);
+ draw_box(x + 20.0f, 20.0f, 0.0f, 55.0f, 55.0f);
+
+ for (i = 0; i < MAX_QUERIES; i++) {
+ (*begin_query)(GL_SAMPLES_PASSED, occ_queries[i]);
+ glColor3ubv(tests[i].color);
+ draw_box(x + tests[i].x, tests[i].y, tests[i].z,
+ tests[i].w, tests[i].h);
+ (*end_query)(GL_SAMPLES_PASSED);
+
+ if (! all_at_once) {
+ (*get_query_objectiv)(occ_queries[i],
+ GL_QUERY_RESULT, &passed);
+ test_pass &= check_result(passed, tests[i].expected);
+ }
+ }
+
+
+ if (all_at_once) {
+ for (i = 0; i < MAX_QUERIES; i++) {
+ (*get_query_objectiv)(occ_queries[i], GL_QUERY_RESULT,
+ &passed);
+ test_pass &= check_result(passed, tests[i].expected);
+ }
+ }
+
+ printf("\n");
+ return test_pass;
+}
+
+enum piglit_result
+piglit_display(void)
+{
+ int test_pass;
+
+ piglit_ortho_projection(piglit_width, piglit_height, GL_FALSE);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ test_pass = do_test(0.0f, 0);
+ test_pass &= do_test(85.0f, 1);
+
+ piglit_present_results();
+
+ return test_pass ? PIGLIT_PASS : PIGLIT_FAIL;
+}
+
+void
+piglit_init(int argc, char **argv)
+{
+ GLint query_bits;
+
+ glClearColor(0.0, 0.2, 0.3, 0.0);
+ glClearDepth(1.0);
+
+ glEnable(GL_DEPTH_TEST);
+ glDepthFunc(GL_LESS);
+
+
+ if (piglit_get_gl_version() >= 15) {
+ gen_queries = glGenQueries;
+ begin_query = glBeginQuery;
+ end_query = glEndQuery;
+ get_queryiv = glGetQueryiv;
+ get_query_objectiv = glGetQueryObjectiv;
+ } else if (piglit_is_extension_supported("GL_ARB_occlusion_query")) {
+ gen_queries = glGenQueriesARB;
+ begin_query = glBeginQueryARB;
+ end_query = glEndQueryARB;
+ get_queryiv = glGetQueryivARB;
+ get_query_objectiv = glGetQueryObjectivARB;
+ } else {
+ piglit_report_result(PIGLIT_SKIP);
+ }
+
+
+ /* It is legal for a driver to support the query API but not have
+ * any query bits. I wonder how many applications actually check for
+ * this case...
+ */
+ (*get_queryiv)(GL_SAMPLES_PASSED, GL_QUERY_COUNTER_BITS,
+ & query_bits);
+ if (query_bits == 0) {
+ piglit_report_result(PIGLIT_SKIP);
+ }
+
+
+ (*gen_queries)(MAX_QUERIES, occ_queries);
+}
--
1.7.10.4
More information about the Piglit
mailing list