Mesa (master): pipe-loader: pass only the driver_name to pipe_loader_find_module
Nicolai Hähnle
nh at kemper.freedesktop.org
Wed Aug 2 07:59:35 UTC 2017
Module: Mesa
Branch: master
Commit: 0d7d60b7eaba68b733ed4d673db30d2a85a7b30a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d7d60b7eaba68b733ed4d673db30d2a85a7b30a
Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date: Fri Jun 30 10:30:14 2017 +0200
pipe-loader: pass only the driver_name to pipe_loader_find_module
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/gallium/auxiliary/pipe-loader/pipe_loader.c | 6 +++---
src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader.c b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
index f55312f548..cb37f30c02 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader.c
@@ -118,7 +118,7 @@ pipe_loader_create_screen(struct pipe_loader_device *dev,
}
struct util_dl_library *
-pipe_loader_find_module(struct pipe_loader_device *dev,
+pipe_loader_find_module(const char *driver_name,
const char *library_paths)
{
struct util_dl_library *lib;
@@ -133,10 +133,10 @@ pipe_loader_find_module(struct pipe_loader_device *dev,
if (len)
ret = util_snprintf(path, sizeof(path), "%.*s/%s%s%s",
len, library_paths,
- MODULE_PREFIX, dev->driver_name, UTIL_DL_EXT);
+ MODULE_PREFIX, driver_name, UTIL_DL_EXT);
else
ret = util_snprintf(path, sizeof(path), "%s%s%s",
- MODULE_PREFIX, dev->driver_name, UTIL_DL_EXT);
+ MODULE_PREFIX, driver_name, UTIL_DL_EXT);
if (ret > 0 && ret < sizeof(path)) {
lib = util_dl_open(path);
diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h b/src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h
index 37219fb894..699040d716 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h
@@ -41,10 +41,10 @@ struct pipe_loader_ops {
};
/**
- * Open the pipe driver module that handles a specified device.
+ * Open the pipe driver module that contains the specified driver.
*/
struct util_dl_library *
-pipe_loader_find_module(struct pipe_loader_device *dev,
+pipe_loader_find_module(const char *driver_name,
const char *library_paths);
/**
More information about the mesa-commit
mailing list