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

[Eric Anholt]

Adam Jackson <ajax at redhat.com> writes:

> 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    | 95 ++++++++++++++++++++++
>  5 files changed, 110 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..88121e9
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_query/egl_ext_device_query.c
> @@ -0,0 +1,95 @@
> +/*
> + * 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.
> + */
> +
> +/**
> + * \file
> + *
> + * Tests for EGL_EXT_device_query
> + */

I don't think "\file" works without a file mentioned.  Maybe just drop
this comment entirely, since it seems pretty empty.

> +
> +#include "piglit-util.h"
> +#include "piglit-util-egl.h"
> +
> +int
> +main(void)
> +{
> +	EGLDisplay dpy;
> +	EGLint egl_major, egl_minor;
> +	EGLDeviceEXT device = EGL_NO_DEVICE_EXT;
> +	const char *devstring = NULL;
> +	EGLBoolean *(*queryDisplayAttrib)(EGLDisplay dpy, EGLint name,
> +					  EGLAttrib *value);
> +	const char *(*queryDeviceString)(EGLDisplay dpy, EGLint name);
> +
> +	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);
> +	}
> +
> +	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);
> +	}
> +
> +	queryDisplayAttrib =
> +		(void *)eglGetProcAddress("eglQueryDisplayAttribEXT");
> +	queryDeviceString =
> +		(void *)eglGetProcAddress("eglQueryDeviceStringEXT");
> +
> +	if (!queryDisplayAttrib || !queryDeviceString) {
> +		printf("No display query entrypoint\n");
> +		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);
> +	}
> +
> +	if ((devstring = queryDeviceString(dpy, EGL_EXTENSIONS)) == NULL) {
> +		printf("Empty device extension string\n");
> +		piglit_report_result(PIGLIT_WARN);
> +	}

Style nitpick: I'd prefer moving the assignment out of the conditional.

> +
> +	printf("Device extension string: %s\n", devstring);
> +	piglit_report_result(PIGLIT_PASS);
> +}

Possible additional tests:

- Make sure that EGL_NOT_INTIIALIZED is errored from
  queryDisplayAttrib before eglInitialize().

- Make sure that EGL_NOT_INTIIALIZED is errored from
  queryDisplayAttrib(dpy, 0x0d0d0d0)

- Make sure that EGL_BAD_DEVICE_EXT is returned from
  queryDeviceString(EGL_NO_DEVICE_EXT, EGL_EXTENSIONS)

- Make sure that EGL_BAD_PARAMETER is returned from
  queryDeviceString(queryDeviceString(device, 0xd0d0d0d0)

- Make sure that eglQueryDeviceAttribEXT is also
  eglGetProcAddress()able.

- Make sure that queryDeviceAttrib(device, 0xd0d0d0d0) throws
  EGL_BAD_ATTRIBUTE

(We can't test EGL_BAD_DEVICE from that function because we don't have a
valid attrib to use)

However, these tests are a good start:

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20160721/2271740b/attachment.sig>