From 71db99e566dddce8ab9af8a42fba33c40238dd51 Mon Sep 17 00:00:00 2001 From: Robert Foss Date: Mon, 31 Jul 2023 16:45:39 +0200 Subject: [PATCH] egl: Always set _EGLDisplay->Device during eglGetPlatformDisplay() Make sure that all platform specific implementations of eglGetPlatformDisplay() overwrite the Device field. Fixes: c237539d621 ("egl: Implement EGL_EXT_explicit_device") Signed-off-by: Robert Foss Reviewed-by: Eric Engestrom Part-of: --- src/egl/main/egldisplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index 1769e19..dd4926c 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -508,7 +508,7 @@ _eglGetX11Display(Display *native_display, const EGLAttrib *attrib_list) } dpy = _eglFindDisplay(_EGL_PLATFORM_X11, native_display, attrib_list); - if (dpy && dev) { + if (dpy) { dpy->Device = dev; } @@ -552,7 +552,7 @@ _eglGetXcbDisplay(xcb_connection_t *native_display, } dpy = _eglFindDisplay(_EGL_PLATFORM_XCB, native_display, attrib_list); - if (dpy && dev) { + if (dpy) { dpy->Device = dev; } -- 2.7.4