From c795abedd2c8d293ad5e9bfac1f8b362260e5bf8 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 27 Jul 2023 00:36:05 +0100 Subject: [PATCH] egl/wayland: Always initialise fd_display_gpu Set it to an invalid value, rather than leaving it to be stdout or something. Signed-off-by: Daniel Stone Part-of: (cherry picked from commit 449e5bad7c31f1099d1fdb7300071c007394c664) --- .pick_status.json | 2 +- src/egl/drivers/dri2/platform_wayland.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index eee5a5cfb20..d76c042613d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -166,7 +166,7 @@ "description": "egl/wayland: Always initialise fd_display_gpu", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 8940c54bc5c..3dc73215be1 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -2772,6 +2772,7 @@ dri2_initialize_wayland_swrast(_EGLDisplay *disp) return _eglError(EGL_BAD_ALLOC, "eglInitialize"); dri2_dpy->fd_render_gpu = -1; + dri2_dpy->fd_display_gpu = -1; disp->DriverData = (void *) dri2_dpy; if (dri2_wl_formats_init(&dri2_dpy->formats) < 0)