From fa541a887c8a6732136280dce18fabfb481b34d7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 18 Jun 2024 13:26:19 -0400 Subject: [PATCH] loader: delete loader_open_driver() no longer used Acked-by: Daniel Stone Part-of: --- src/loader/loader.c | 49 --------------------------------------------- src/loader/loader.h | 6 ------ 2 files changed, 55 deletions(-) diff --git a/src/loader/loader.c b/src/loader/loader.c index b76fc0d1220..ec3576b1cac 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -863,52 +863,3 @@ loader_open_driver_lib(const char *driver_name, return driver; } - -/** - * Opens a DRI driver using its driver name, returning the __DRIextension - * entrypoints. - * - * \param driverName - a name like "i965", "radeon", "nouveau", etc. - * \param out_driver - Address where the dlopen() return value will be stored. - * \param search_path_vars - NULL-terminated list of env vars that can be used - * to override the DEFAULT_DRIVER_DIR search path. - */ -const struct __DRIextensionRec ** -loader_open_driver(const char *driver_name, - void **out_driver_handle, - const char **search_path_vars, - bool driver_name_is_inferred) -{ - char *get_extensions_name; - const struct __DRIextensionRec **extensions = NULL; - const struct __DRIextensionRec **(*get_extensions)(void); - - void *driver = loader_open_driver_lib("libgallium", "", search_path_vars, - DEFAULT_DRIVER_DIR, !driver_name_is_inferred); - - if (!driver) - goto failed; - - get_extensions_name = loader_get_extensions_name(driver_name); - if (get_extensions_name) { - get_extensions = dlsym(driver, get_extensions_name); - if (get_extensions) { - extensions = get_extensions(); - } else { - log_(_LOADER_DEBUG, "MESA-LOADER: driver does not expose %s(): %s\n", - get_extensions_name, dlerror()); - } - free(get_extensions_name); - } - - if (extensions == NULL) { - log_(_LOADER_WARNING, - "MESA-LOADER: driver exports no extensions (%s)\n", dlerror()); - dlclose(driver); - driver = NULL; - } - -failed: - *out_driver_handle = driver; - return extensions; -} diff --git a/src/loader/loader.h b/src/loader/loader.h index 2e0797f3a5e..07dcf2e9fe1 100644 --- a/src/loader/loader.h +++ b/src/loader/loader.h @@ -69,12 +69,6 @@ loader_open_driver_lib(const char *driver_name, const char *default_search_path, bool warn_on_fail); -const struct __DRIextensionRec ** -loader_open_driver(const char *driver_name, - void **out_driver_handle, - const char **search_path_vars, - bool driver_name_is_inferred); - char * loader_get_device_name_for_fd(int fd);