From 9217e49e80ee9da0f7b272e21076a98bbe6dc78b Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 22 Nov 2022 15:05:10 -0800 Subject: [PATCH] egl/x11: Match loader_destroy_screen_resources() with init(). With the DRI2 removal, it became clear that this code wasn't actually being called in the DRI3 path. Part-of: --- src/egl/drivers/dri2/egl_dri2.h | 2 -- src/egl/drivers/dri2/platform_x11.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 78b7ae657f0..c1045774853 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -215,8 +215,6 @@ struct dri2_egl_display { mtx_t lock; - int dri2_major; - int dri2_minor; struct dri_screen *dri_screen_render_gpu; /* dri_screen_display_gpu holds display GPU in case of prime gpu offloading * else dri_screen_render_gpu and dri_screen_display_gpu is same. In case of diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index 92c3c9e470c..2d011fe2118 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -1364,8 +1364,7 @@ void dri2_teardown_x11(struct dri2_egl_display *dri2_dpy) { #ifdef HAVE_LIBDRM - if (dri2_dpy->dri2_major >= 3) - loader_destroy_screen_resources(&dri2_dpy->screen_resources); + loader_destroy_screen_resources(&dri2_dpy->screen_resources); #endif if (dri2_dpy->own_device)