summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2017-06-30 10:30:14 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2017-07-13 13:27:46 +0200
commitbb14418d999d48f55646568ba3d15c4bfba8ffe4 (patch)
tree1ce83c3e14da158075a11d3f2b4e12a703cf5404
parent91c1fe42d585ddffc15cac883805f63bd85455c4 (diff)
pipe-loader: pass only the driver_name to pipe_loader_find_module
-rw-r--r--src/gallium/auxiliary/pipe-loader/pipe_loader.c6
-rw-r--r--src/gallium/auxiliary/pipe-loader/pipe_loader_priv.h4
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);
/**