summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-10-14 14:52:37 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-11-21 12:52:18 +0000
commitcbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2 (patch)
tree1c48765356cbc248c572822944e57b4b075992b3 /src/gallium/targets
parent149454bb13aba2815e1a577073e5a834507cbb4c (diff)
downloadexternal_mesa3d-cbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2.zip
external_mesa3d-cbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2.tar.gz
external_mesa3d-cbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2.tar.bz2
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 <axel.davy@ens.fr> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/d3dadapter9/drm.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index 89789fa..92567ac 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) {