From 40308ef6e5b71be30fb85ee1ac45796288cd8d0e Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Wed, 15 Jan 2025 19:10:49 +0100 Subject: [PATCH] egl/wayland: validate dri_screen_display_gpu before use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Eric Engestrom Reviewed-by: Simon Ser Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12370 Fixes: d795b4712cb ("egl/wayland: only supply LINEAR modifier when supported") Part-of: --- src/egl/drivers/dri2/platform_wayland.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 9c60a89e902..1f66a92fd35 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -1224,12 +1224,13 @@ get_back_bo(struct dri2_egl_surface *dri2_surf) render_modifiers = &linear_mod; render_num_modifiers = 1; } - if (dri2_dpy->dri_screen_display_gpu->base.screen->resource_create_with_modifiers) { - display_modifiers = &linear_mod; - display_num_modifiers = 1; - } if (dri2_dpy->dri_screen_display_gpu) { + if (dri2_dpy->dri_screen_display_gpu->base.screen->resource_create_with_modifiers) { + display_modifiers = &linear_mod; + display_num_modifiers = 1; + } + linear_copy_display_gpu_image = dri_create_image_with_modifiers( dri2_dpy->dri_screen_display_gpu, dri2_surf->base.Width, dri2_surf->base.Height,