[Piglit] [PATCH 3/3] glx: Add variants of the glx-visuals-{depth, stencil} using pixmap FBConfigs.

Eric Anholt eric at anholt.net
Tue Jan 17 11:00:09 PST 2012


This ensures coverage of the 16-bit-depth FBconfigs on the Intel
driver, which otherwise are untested.
---
 tests/all.tests                 |    2 ++
 tests/glx/glx-visuals-depth.c   |    9 +++++++--
 tests/glx/glx-visuals-stencil.c |    9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/all.tests b/tests/all.tests
index b1cc91e..1c349df 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -604,7 +604,9 @@ add_plain_test(glx, 'glx-pixmap-multi')
 glx['glx-pixmap-multi'].runConcurrent = True
 add_plain_test(glx, 'glx-tfp')
 add_plain_test(glx, 'glx-visuals-depth')
+add_concurrent_test(glx, 'glx-visuals-depth -pixmap')
 add_plain_test(glx, 'glx-visuals-stencil')
+add_concurrent_test(glx, 'glx-visuals-stencil -pixmap')
 add_plain_test(glx, 'glx-window-life')
 glx['glx-window-life'].runConcurrent = True
 add_plain_test(glx, 'glx-pixmap-crosscheck')
diff --git a/tests/glx/glx-visuals-depth.c b/tests/glx/glx-visuals-depth.c
index 3d9259c..572c625 100644
--- a/tests/glx/glx-visuals-depth.c
+++ b/tests/glx/glx-visuals-depth.c
@@ -98,7 +98,12 @@ draw(Display *dpy, GLXFBConfig config)
 int
 main(int argc, char **argv)
 {
-	piglit_report_result(piglit_glx_iterate_visuals(draw));
+	enum piglit_result result;
 
-	return 0;
+	if (argc > 1 && strcmp(argv[1], "-pixmap") == 0)
+		result = piglit_glx_iterate_pixmap_fbconfigs(draw);
+	else
+		result = piglit_glx_iterate_visuals(draw);
+
+	piglit_report_result(result);
 }
diff --git a/tests/glx/glx-visuals-stencil.c b/tests/glx/glx-visuals-stencil.c
index aa8028a..fc261d2 100644
--- a/tests/glx/glx-visuals-stencil.c
+++ b/tests/glx/glx-visuals-stencil.c
@@ -98,7 +98,12 @@ draw(Display *dpy, GLXFBConfig config)
 int
 main(int argc, char **argv)
 {
-	piglit_report_result(piglit_glx_iterate_visuals(draw));
+	enum piglit_result result;
 
-	return 0;
+	if (argc > 1 && strcmp(argv[1], "-pixmap") == 0)
+		result = piglit_glx_iterate_pixmap_fbconfigs(draw);
+	else
+		result = piglit_glx_iterate_visuals(draw);
+
+	piglit_report_result(result);
 }
-- 
1.7.7.3



More information about the Piglit mailing list