[Piglit] [PATCH 2/2] egl: Add sanity test for EGL_EXT_device_enumeration (v2)
Mathias Fröhlich
Mathias.Froehlich at gmx.net
Sat Jul 23 06:54:55 UTC 2016
Good morning,
On Friday, July 22, 2016 11:17:08 Adam Jackson wrote:
> v2: Cover more error paths (Eric Anholt)
I really meant this test for calling the the device enumeration
function without the eglInitialize call on the default display.
I did not mean the time the function pointers are queried.
So, the sequence here should be IMO:
eglQueryDevicesEXT(...device...);
dpy = eglGetPlatformDisplayEXT(...device from above...);
eglInitialize(dpy...);
... setup the surfaces (if not surfaceless) and context ...
that is we should not need any eglInitialized display before
calling eglQueryDevicesEXT or before calling eglGetPlatformDisplayEXT.
The resulting display from eglGetPlatformDisplayEXT is then fed to
the initialize call.
In other words the above sequence should *replace* the
dpy = eglGetDisplay(...);
eglInitialize(dpy...);
... setup the surfaces (if not surfaceless) and context ...
sequence and give especially access to OpenGL *without* the
need to have any default display open and/or initialized.
Of course extensions must be queried as well as function pointers
retrieved and error return checks made.
You can look at the test that I sent yesterday.
Also there is an article from nvidia that kind of illustrates
what this feature is meant for:
https://devblogs.nvidia.com/parallelforall/egl-eye-opengl-visualization-without-x-server/
Regards
Mathias
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
> tests/all.py | 6 +
> tests/egl/spec/CMakeLists.txt | 1 +
> .../CMakeLists.no_api.txt | 7 ++
> .../spec/egl_ext_device_enumeration/CMakeLists.txt | 1 +
> .../egl_ext_device_enumeration.c | 134 +++++++++++++++++++++
> 5 files changed, 149 insertions(+)
> create mode 100644 tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
> create mode 100644 tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
> create mode 100644 tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
>
> diff --git a/tests/all.py b/tests/all.py
> index 73244eb..a198849 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4511,6 +4511,12 @@ with profile.group_manager(
> g(['egl_ext_device_query'], 'conformance')
>
> with profile.group_manager(
> + PiglitGLTest,
> + grouptools.join('spec', 'egl_ext_device_enumeration'),
> + exclude_platforms=['glx']) as g:
> + g(['egl_ext_device_enumeration'], '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 0868cc0..7206556 100644
> --- a/tests/egl/spec/CMakeLists.txt
> +++ b/tests/egl/spec/CMakeLists.txt
> @@ -1,6 +1,7 @@
> add_subdirectory (egl-1.4)
> add_subdirectory (egl_ext_client_extensions)
> add_subdirectory (egl_ext_device_query)
> +add_subdirectory (egl_ext_device_enumeration)
> 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_enumeration/CMakeLists.no_api.txt b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
> new file mode 100644
> index 0000000..381f080
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
> @@ -0,0 +1,7 @@
> +link_libraries(
> + piglitutil
> +)
> +
> +piglit_add_executable(egl_ext_device_enumeration egl_ext_device_enumeration.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
> new file mode 100644
> index 0000000..144a306
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c b/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
> new file mode 100644
> index 0000000..640b754
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
> @@ -0,0 +1,134 @@
> +/*
> + * 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;
> + EGLint i, numdevs, error;
> + EGLDeviceEXT devs[1024];
> + EGLBoolean (*queryDevices)(EGLint maxdevs, EGLDeviceEXT *devs,
> + EGLint *numdevs);
> +
> + 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") &&
> + piglit_is_extension_in_string(client_exts,
> + "EGL_EXT_device_enumeration");
> +
> + if (!has_client_ext) {
> + printf("EGL_EXT_device_enumeration not supported\n");
> + piglit_report_result(PIGLIT_SKIP);
> + }
> +
> + 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);
> + }
> +
> + queryDevices = (void *)eglGetProcAddress("eglQueryDevicesEXT");
> +
> + if (!queryDevices) {
> + printf("No device query entrypoint\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + if (queryDevices(0, NULL, &numdevs) == EGL_FALSE) {
> + printf("Failed to get device count\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + if (numdevs < 1) {
> + printf("No devices supported\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + memset(devs, 0, sizeof devs);
> + if (queryDevices(numdevs, devs, &numdevs) == EGL_FALSE) {
> + printf("Failed to enumerate devices\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + for (i = 0; i < numdevs; i++)
> + if (devs[i] == NULL) {
> + printf("Enumerated device slot not initialized\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + for (i = numdevs; i < ARRAY_SIZE(devs); i++)
> + if (devs[i] != NULL) {
> + printf("Non-enumerated device slot initialized\n");
> + piglit_report_result(PIGLIT_FAIL);
> + }
> +
> + if (queryDevices(0, devs, &numdevs) == EGL_TRUE) {
> + printf("Querying zero devices succeeded\n");
> + piglit_report_result(PIGLIT_FAIL);
> + } else {
> + error = eglGetError();
> + if (error != EGL_BAD_PARAMETER) {
> + printf("Querying zero devices threw error %x\n",
> + error);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + }
> +
> + if (queryDevices(-1, devs, &numdevs) == EGL_TRUE) {
> + printf("Querying negative devices succeeded\n");
> + piglit_report_result(PIGLIT_FAIL);
> + } else {
> + error = eglGetError();
> + if (error != EGL_BAD_PARAMETER) {
> + printf("Querying negative devices threw error %x\n",
> + error);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + }
> +
> + if (queryDevices(ARRAY_SIZE(devs), devs, NULL) == EGL_TRUE) {
> + printf("Querying devices succeeded without storing count\n");
> + piglit_report_result(PIGLIT_FAIL);
> + } else {
> + error = eglGetError();
> + if (error != EGL_BAD_PARAMETER) {
> + printf("Bad device count storage threw error %x\n",
> + error);
> + piglit_report_result(PIGLIT_FAIL);
> + }
> + }
> +
> + piglit_report_result(PIGLIT_PASS);
> +}
>
More information about the Piglit
mailing list