diff options
| author | Emil Velikov <[email protected]> | 2015-10-14 14:52:37 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-11-21 12:52:18 +0000 |
| commit | cbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2 (patch) | |
| tree | 1c48765356cbc248c572822944e57b4b075992b3 /src/gallium | |
| parent | 149454bb13aba2815e1a577073e5a834507cbb4c (diff) | |
targets/nine: remove the custom pipe-driver path management
Since the up-streaming of nine, the static target was used by default.
The dynamic pipe-drivers being available only via manual tweak of
configure.ac.
As we'll be removing the library_path argument from the pipe-loader with
follow-up commits, we can remove D3D9_DRIVERS_PATH/D3D9_DRIVERS_DIR.
Everyone doing local hacking on nine, or wishing to have a env override
can bring them back within the pipe-loader.
Cc: Axel Davy <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/d3dadapter9/drm.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index 89789fa3da9..92567ac65a3 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -215,14 +215,6 @@ drm_create_adapter( int fd, driOptionCache userInitOptions; int throttling_value_user = -2; -#if !GALLIUM_STATIC_TARGETS - const char *paths[] = { - getenv("D3D9_DRIVERS_PATH"), - getenv("D3D9_DRIVERS_DIR"), - PIPE_SEARCH_DIR - }; -#endif - if (!ctx) { return E_OUTOFMEMORY; } ctx->base.destroy = drm_destroy; @@ -243,11 +235,7 @@ drm_create_adapter( int fd, } /* use pipe-loader to create a drm screen (hal) */ - ctx->base.hal = NULL; - for (i = 0; !ctx->base.hal && i < Elements(paths); ++i) { - if (!paths[i]) { continue; } - ctx->base.hal = pipe_loader_create_screen(ctx->dev, paths[i]); - } + ctx->base.hal = pipe_loader_create_screen(ctx->dev, PIPE_SEARCH_DIR); #endif if (!ctx->base.hal) { ERR("Unable to load requested driver.\n"); @@ -313,11 +301,7 @@ drm_create_adapter( int fd, #else /* wrap it to create a software screen that can share resources */ if (pipe_loader_sw_probe_wrapped(&ctx->swdev, ctx->base.hal)) { - ctx->base.ref = NULL; - for (i = 0; !ctx->base.ref && i < Elements(paths); ++i) { - if (!paths[i]) { continue; } - ctx->base.ref = pipe_loader_create_screen(ctx->swdev, paths[i]); - } + ctx->base.ref = pipe_loader_create_screen(ctx->swdev, PIPE_SEARCH_DIR); } #endif if (!ctx->base.ref) { |