From 41797e16599304e9e300e60c54f7d9457ff2b848 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 13 May 2010 08:27:37 -0400 Subject: [PATCH] egl: Don't try to load driver basename if the platform needs a suffix That is, don't dlopen(egl_glx) when we know we need to append .so. --- src/egl/main/egldriver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c index 052e6110bfb..28649563a4d 100644 --- a/src/egl/main/egldriver.c +++ b/src/egl/main/egldriver.c @@ -293,9 +293,9 @@ _eglLoaderFile(const char *dir, size_t len, void *loader_data) len += flen; path[len] = '\0'; - drv = _eglLoadDriver(path, NULL); - /* fix the path and load again */ - if (!drv && library_suffix()) { + if (library_suffix() == NULL || strstr(path, library_suffix())) + drv = _eglLoadDriver(path, NULL); + else { const char *suffix = library_suffix(); size_t slen = strlen(suffix); const char *p; @@ -306,6 +306,8 @@ _eglLoaderFile(const char *dir, size_t len, void *loader_data) if (need_suffix && len + slen + 1 <= sizeof(path)) { strcpy(path + len, suffix); drv = _eglLoadDriver(path, NULL); + } else { + drv = NULL; } } if (!drv) -- 2.30.2