fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gbm: Add support for the new __driDriverGetExtensions interface.

Browse source 
v2: Fix uninitialized variable use in the old-ABI case.

Reviewed-by: Chad Versace <chad.versace@linux.intel.com> (v1)
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Eric Anholt 2013-10-11 17:38:18 -07:00
parent a64bb7553a
commit 67caf36489
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gbm/backends/dri/gbm_dri.c
View file

@ -169,8 +169,9 @@ dri_bind_extensions(struct gbm_dri_device *dri,
static int
dri_load_driver(struct gbm_dri_device *dri)
{
const __DRIextension **extensions;
const __DRIextension **extensions = NULL;
char path[PATH_MAX], *search_paths, *p, *next, *end;
char *get_extensions_name;
search_paths = NULL;
if (geteuid() == getuid()) {
@ -209,7 +210,19 @@ dri_load_driver(struct gbm_dri_device *dri)
return -1;
}
extensions = dlsym(dri->driver, __DRI_DRIVER_EXTENSIONS);
if (asprintf(&get_extensions_name, "%s_%s",
__DRI_DRIVER_GET_EXTENSIONS, dri->base.driver_name) != -1) {
const __DRIextension **(*get_extensions)(void);
get_extensions = dlsym(dri->driver, get_extensions_name);
free(get_extensions_name);
if (get_extensions)
extensions = get_extensions();
}
if (!extensions)
extensions = dlsym(dri->driver, __DRI_DRIVER_EXTENSIONS);
if (extensions == NULL) {
fprintf(stderr, "gbm: driver exports no extensions (%s)", dlerror());
dlclose(dri->driver);