OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Don't try to load driver basename if the platform needs a suffix

Browse Source 
That is, don't dlopen(egl_glx) when we know we need to append .so.
This commit is contained in:
Kristian Høgsberg
2010-05-13 08:27:37 -04:00
parent 8230ead0cf
commit 41797e1659
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/egl/main/egldriver.c
View File

@@ -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)