From 7ea0091a1934ae33f77377765a541c7def2931bf Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 30 Jul 2024 09:09:52 -0400 Subject: [PATCH] egl: inline CONFIG_OPTIONS usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this is always supported Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 7 +++---- src/egl/meson.build | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index a400e2d324b..a38aac172ca 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -60,6 +60,7 @@ #endif #include "GL/mesa_glinterop.h" +#include "pipe-loader/pipe_loader.h" #include "loader/loader.h" #include "mapi/glapi/glapi.h" #include "pipe/p_screen.h" @@ -693,7 +694,7 @@ dri2_query_driver_config(_EGLDisplay *disp) struct dri2_egl_display *dri2_dpy = dri2_egl_display_lock(disp); char *ret; - ret = dri2_dpy->configOptions->getXml(dri2_dpy->driver_name); + ret = pipe_loader_get_driinfo_xml(dri2_dpy->driver_name); mtx_unlock(&dri2_dpy->lock); @@ -762,9 +763,7 @@ dri2_setup_screen(_EGLDisplay *disp) disp->Extensions.MESA_gl_interop = EGL_TRUE; } - if (dri2_dpy->configOptions) { - disp->Extensions.MESA_query_driver = EGL_TRUE; - } + disp->Extensions.MESA_query_driver = EGL_TRUE; /* Report back to EGL the bitmask of priorities supported */ disp->Extensions.IMG_context_priority = diff --git a/src/egl/meson.build b/src/egl/meson.build index cee123e6a0c..09c89ffb1ef 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -6,7 +6,7 @@ inc_egl_dri2 = include_directories('drivers/dri2') c_args_for_egl = [asan_c_args] cpp_args_for_egl = [] -link_for_egl = [] +link_for_egl = [libpipe_loader_dynamic] if with_dri link_for_egl += libgallium_dri endif