diff options
| author | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-06-30 10:30:14 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <nicolai.haehnle@amd.com> | 2017-07-31 15:56:56 +0200 |
| commit | 4ffd7f6ab5b1d3fd22702ff951a94591e974bfc5 (patch) | |
| tree | 340b30bac75dc758b1365170e4ecf2c93e8f3553 | |
| parent | 6c8fa09f2d86a3391d496e75c45acf8a07c431e2 (diff) | |
pipe-loader: pass only the driver_name to pipe_loader_find_module
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
| -rw-r--r-- | src/gallium/auxiliary/pipe-loader/pipe_loader.c | 6 | ||||
| -rw-r--r-- | 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); /** |