Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 57de1ff6758ec5ea4a52637f233e3e3150086255 Mon Sep 17 00:00:00 2001 |
| 2 | From: Daniel Diaz <daniel.diaz@linaro.org> |
| 3 | Date: Wed, 17 May 2017 18:00:17 -0500 |
| 4 | Subject: [PATCH 4/4] egl_mesa_platform_surfaceless: Use EXT functions for |
| 5 | surfaces |
| 6 | MIME-Version: 1.0 |
| 7 | Content-Type: text/plain; charset=UTF-8 |
| 8 | Content-Transfer-Encoding: 8bit |
| 9 | |
| 10 | These EXT symbols are guaranteed to exist since they require |
| 11 | EGL_EXT_platform_base. |
| 12 | |
| 13 | Upstream-Status: Accepted, since git 7b74602. |
| 14 | |
| 15 | Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> |
| 16 | Reviewed-by: Emil Velikov <emil.velikov@collabora.com> |
| 17 | --- |
| 18 | .../egl_mesa_platform_surfaceless.c | 23 ++++++++++++++++++++-- |
| 19 | 1 file changed, 21 insertions(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c |
| 22 | index 81a3919..264ed71 100644 |
| 23 | --- a/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c |
| 24 | +++ b/tests/egl/spec/egl_mesa_platform_surfaceless/egl_mesa_platform_surfaceless.c |
| 25 | @@ -24,6 +24,24 @@ |
| 26 | #include "piglit-util.h" |
| 27 | #include "piglit-util-egl.h" |
| 28 | |
| 29 | +/* Extension function pointers. |
| 30 | + * |
| 31 | + * Use prefix 'pegl' (piglit egl) instead of 'egl' to avoid collisions with |
| 32 | + * prototypes in eglext.h. */ |
| 33 | +EGLSurface (*peglCreatePlatformPixmapSurfaceEXT)(EGLDisplay display, EGLConfig config, |
| 34 | + NativePixmapType native_pixmap, const EGLint *attrib_list); |
| 35 | +EGLSurface (*peglCreatePlatformWindowSurfaceEXT)(EGLDisplay display, EGLConfig config, |
| 36 | + NativeWindowType native_window, const EGLint *attrib_list); |
| 37 | + |
| 38 | +static void |
| 39 | +init_egl_extension_funcs(void) |
| 40 | +{ |
| 41 | + peglCreatePlatformPixmapSurfaceEXT = (void*) |
| 42 | + eglGetProcAddress("eglCreatePlatformPixmapSurfaceEXT"); |
| 43 | + peglCreatePlatformWindowSurfaceEXT = (void*) |
| 44 | + eglGetProcAddress("eglCreatePlatformWindowSurfaceEXT"); |
| 45 | +} |
| 46 | + |
| 47 | static void |
| 48 | test_setup(EGLDisplay *dpy) |
| 49 | { |
| 50 | @@ -72,7 +90,7 @@ test_create_window(void *test_data) |
| 51 | |
| 52 | test_setup(&dpy); |
| 53 | |
| 54 | - surf = eglCreatePlatformWindowSurface(dpy, EGL_NO_CONFIG_KHR, |
| 55 | + surf = peglCreatePlatformWindowSurfaceEXT(dpy, EGL_NO_CONFIG_KHR, |
| 56 | /*native_window*/ NULL, |
| 57 | /*attrib_list*/ NULL); |
| 58 | if (surf) { |
| 59 | @@ -103,7 +121,7 @@ test_create_pixmap(void *test_data) |
| 60 | |
| 61 | test_setup(&dpy); |
| 62 | |
| 63 | - surf = eglCreatePlatformPixmapSurface(dpy, EGL_NO_CONFIG_KHR, |
| 64 | + surf = peglCreatePlatformPixmapSurfaceEXT(dpy, EGL_NO_CONFIG_KHR, |
| 65 | /*native_window*/ NULL, |
| 66 | /*attrib_list*/ NULL); |
| 67 | if (surf) { |
| 68 | @@ -205,6 +223,7 @@ main(int argc, char **argv) |
| 69 | piglit_report_result(PIGLIT_FAIL); |
| 70 | } |
| 71 | |
| 72 | + init_egl_extension_funcs(); |
| 73 | result = piglit_run_selected_subtests(subtests, selected_names, |
| 74 | num_selected, result); |
| 75 | piglit_report_result(result); |
| 76 | -- |
| 77 | 1.9.1 |
| 78 | |