From 159a3edd80a988dec263708f851ed35eec881a78 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 19 Jul 2024 09:22:50 +0200 Subject: [PATCH] egl,gbm,glx: fix log message spam MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on the other similar logs we only want to log when extensions is NULL. Use this opportunity to indicate the source of the log and remove the extra ')' at the end of each line. Fixes: 50fc7cc290d ("glx: directly link to gallium") Reviewed-by: Eric Engestrom Reviewed-by: Marek Olšák Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 2 +- src/gbm/backends/dri/gbm_dri.c | 2 +- src/glx/dri_common.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index cab322c9819..5857acbcdf3 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -666,7 +666,7 @@ dri2_load_driver_common(_EGLDisplay *disp, extensions = dri2_open_driver(disp); if (!extensions) { if (disp->Options.FallbackZink) - _eglLog(_LOADER_WARNING, "MESA-LOADER: failed to open %s: driver not built!)\n", dri2_dpy->driver_name); + _eglLog(_LOADER_WARNING, "MESA-LOADER: egl: failed to open %s: driver not built!\n", dri2_dpy->driver_name); return EGL_FALSE; } diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index fd06fd3bd97..9ab5e452872 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -275,7 +275,7 @@ dri_screen_create_for_driver(struct gbm_dri_device *dri, char *driver_name, bool const __DRIextension **extensions = dri_open_driver(dri); if (!extensions) { if (driver_name_is_inferred) - fprintf(stderr, "MESA-LOADER: failed to open %s: driver not built!)\n", dri->driver_name); + fprintf(stderr, "MESA-LOADER: gbm: failed to open %s: driver not built!\n", dri->driver_name); goto fail; } diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index a02f8492244..8ddad6f0b51 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -78,9 +78,9 @@ driOpenDriver(const char *driverName, bool driver_name_is_inferred) const __DRIextension **extensions = dri_loader_get_extensions(driverName); - if (driver_name_is_inferred) { + if (!extensions && driver_name_is_inferred) { glx_message(_LOADER_WARNING, - "MESA-LOADER: failed to open %s: driver not built!)\n", driverName); + "MESA-LOADER: glx: failed to open %s: driver not built!\n", driverName); } if (glhandle)