[Piglit] [PATCH 1/2] egl: Add sanity test for EGL_EXT_device_query (v2)

Adam Jackson ajax at redhat.com
Fri Jul 22 15:17:07 UTC 2016


v2:
- Cover more error paths, also look up QueryDeviceAttrib (Eric Anholt)
- Fetch function pointers before EGL initialized (Mathias Fröhlich)

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 tests/all.py                                       |   6 +
 tests/egl/spec/CMakeLists.txt                      |   1 +
 .../egl_ext_device_query/CMakeLists.no_api.txt     |   7 +
 tests/egl/spec/egl_ext_device_query/CMakeLists.txt |   1 +
 .../egl_ext_device_query/egl_ext_device_query.c    | 162 +++++++++++++++++++++
 5 files changed, 177 insertions(+)
 create mode 100644 tests/egl/spec/egl_ext_device_query/CMakeLists.no_api.txt
 create mode 100644 tests/egl/spec/egl_ext_device_query/CMakeLists.txt
 create mode 100644 tests/egl/spec/egl_ext_device_query/egl_ext_device_query.c

diff --git a/tests/all.py b/tests/all.py
index 2c78b0a..73244eb 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -4505,6 +4505,12 @@ with profile.group_manager(
     g(['egl_chromium_sync_control'], 'conformance')
 
 with profile.group_manager(
+        PiglitGLTest,
+        grouptools.join('spec', 'egl_ext_device_query'),
+        exclude_platforms=['glx']) as g:
+    g(['egl_ext_device_query'], 'conformance')
+
+with profile.group_manager(
         PiglitGLTest, grouptools.join('spec', '!opengl ES 2.0')) as g:
     g(['glsl-fs-pointcoord_gles2'], 'glsl-fs-pointcoord')
     g(['invalid-es3-queries_gles2'])
diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt
index 5d5fc78..0868cc0 100644
--- a/tests/egl/spec/CMakeLists.txt
+++ b/tests/egl/spec/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory (egl-1.4)
 add_subdirectory (egl_ext_client_extensions)
+add_subdirectory (egl_ext_device_query)
 add_subdirectory (egl_khr_create_context)
 add_subdirectory (egl_khr_get_all_proc_addresses)
 add_subdirectory (egl_khr_fence_sync)
diff --git a/tests/egl/spec/egl_ext_device_query/CMakeLists.no_api.txt b/tests/egl/spec/egl_ext_device_query/CMakeLists.no_api.txt
new file mode 100644
index 0000000..a374809
--- /dev/null
+++ b/tests/egl/spec/egl_ext_device_query/CMakeLists.no_api.txt
@@ -0,0 +1,7 @@
+link_libraries(
+	piglitutil
+)
+
+piglit_add_executable(egl_ext_device_query egl_ext_device_query.c)
+
+# vim: ft=cmake:
diff --git a/tests/egl/spec/egl_ext_device_query/CMakeLists.txt b/tests/egl/spec/egl_ext_device_query/CMakeLists.txt
new file mode 100644
index 0000000..144a306
--- /dev/null
+++ b/tests/egl/spec/egl_ext_device_query/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/egl/spec/egl_ext_device_query/egl_ext_device_query.c b/tests/egl/spec/egl_ext_device_query/egl_ext_device_query.c
new file mode 100644
index 0000000..2314f5a
--- /dev/null
+++ b/tests/egl/spec/egl_ext_device_query/egl_ext_device_query.c
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 2016 Red Hat, Inc.
+ * Copyright 2015 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.h"
+#include "piglit-util-egl.h"
+
+int
+main(void)
+{
+	EGLDisplay dpy;
+	EGLint egl_major, egl_minor, error;
+	EGLDeviceEXT device = EGL_NO_DEVICE_EXT;
+	EGLAttrib attr;
+	const char *devstring = NULL;
+	EGLBoolean (*queryDisplayAttrib)(EGLDisplay dpy, EGLint name,
+					 EGLAttrib *value);
+	const char *(*queryDeviceString)(EGLDisplay dpy, EGLint name);
+	EGLBoolean (*queryDeviceAttrib)(EGLDeviceEXT dev, EGLint name,
+					EGLAttrib *value);
+
+	const char *client_exts = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+	bool has_client_ext =
+		client_exts &&
+		piglit_is_extension_in_string(client_exts,
+			"EGL_EXT_device_query");
+
+	if (!has_client_ext) {
+		printf("EGL_EXT_device_query not supported\n");
+		piglit_report_result(PIGLIT_SKIP);
+	}
+
+	queryDisplayAttrib =
+		(void *)eglGetProcAddress("eglQueryDisplayAttribEXT");
+	queryDeviceString =
+		(void *)eglGetProcAddress("eglQueryDeviceStringEXT");
+	queryDeviceAttrib =
+		(void *)eglGetProcAddress("eglQueryDeviceAttribEXT");
+
+	if (!queryDisplayAttrib || !queryDeviceString || !queryDeviceAttrib) {
+		printf("No display query entrypoint\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (queryDisplayAttrib(EGL_NO_DISPLAY, EGL_DEVICE_EXT,
+			       (EGLAttrib *)&device) == EGL_TRUE) {
+		printf("Display query succeeded before EGL initialized\n");
+		piglit_report_result(PIGLIT_FAIL);
+	} else {
+		/*
+		 * the spec only mentions NOT_INITIALIZED, but BAD_DISPLAY would
+		 * also be reasonable, the implementation is allowed to throw any
+		 * applicable error, and Mesa's egl has to check the display first
+		 * to know if egl is initialized yet.
+		 */
+		error = eglGetError();
+		if (error != EGL_NOT_INITIALIZED &&
+		    error != EGL_BAD_DISPLAY) {
+			printf("Null display query threw error %x\n", error);
+			piglit_report_result(PIGLIT_FAIL);
+		}
+	}
+
+	dpy = eglGetDisplay(NULL);
+	if (!dpy) {
+		printf("failed to get EGLDisplay\n");
+		piglit_report_result(PIGLIT_SKIP);
+	}
+
+	if (!eglInitialize(dpy, &egl_major, &egl_minor)) {
+		printf("eglInitialize failed\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (queryDisplayAttrib(dpy, 0xbad1dea, (EGLAttrib *)&device)
+	    == EGL_TRUE) {
+		printf("Successfully queried for a bogus attribute\n");
+		piglit_report_result(PIGLIT_FAIL);
+	} else {
+		error = eglGetError();
+		if (error != EGL_BAD_ATTRIBUTE) {
+			printf("Bad display query threw error %x\n", error);
+			piglit_report_result(PIGLIT_FAIL);
+		}
+	}
+
+	if (queryDisplayAttrib(dpy, EGL_DEVICE_EXT, (EGLAttrib *)&device)
+	    == EGL_FALSE) {
+		printf("Failed to query display\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	if (device == EGL_NO_DEVICE_EXT) {
+		printf("Got no device handle\n");
+		piglit_report_result(PIGLIT_FAIL);
+	}
+
+	devstring = queryDeviceString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+	if (devstring) {
+		printf("Successfully queried extensions for a bogus display");
+		piglit_report_result(PIGLIT_FAIL);
+	} else {
+		error = eglGetError();
+		if (error != EGL_BAD_PARAMETER) {
+			printf("Bogus display query threw error %x\n", error);
+			piglit_report_result(PIGLIT_FAIL);
+		}
+	}
+
+	devstring = queryDeviceString(dpy, 0xbad1dea);
+	if (devstring) {
+		printf("Successfully queried for a bogus string");
+		piglit_report_result(PIGLIT_FAIL);
+	} else {
+		error = eglGetError();
+		if (error != EGL_BAD_PARAMETER) {
+			printf("Bogus string query threw error %x\n", error);
+			piglit_report_result(PIGLIT_FAIL);
+		}
+	}
+
+	devstring = queryDeviceString(dpy, EGL_EXTENSIONS);
+	if (devstring == NULL) {
+		printf("Empty device extension string\n");
+		piglit_report_result(PIGLIT_WARN);
+	}
+
+	if (queryDeviceAttrib(device, 0xbad1dea, &attr)) {
+		printf("Successfully queried for a bogus attribute\n");
+		piglit_report_result(PIGLIT_FAIL);
+	} else {
+		error = eglGetError();
+		if (error != EGL_BAD_ATTRIBUTE) {
+			printf("Bogus attribute query threw error %x\n",
+			       error);
+			piglit_report_result(PIGLIT_FAIL);
+		}
+	}
+
+	printf("Device extension string: %s\n", devstring);
+	piglit_report_result(PIGLIT_PASS);
+}
-- 
2.7.4



More information about the Piglit mailing list