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>
driOptionCache userInitOptions;
int throttling_value_user = -2;
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;
if (!ctx) { return E_OUTOFMEMORY; }
ctx->base.destroy = drm_destroy;
}
/* use pipe-loader to create a drm screen (hal) */
}
/* 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");
#endif
if (!ctx->base.hal) {
ERR("Unable to load requested driver.\n");
#else
/* wrap it to create a software screen that can share resources */
if (pipe_loader_sw_probe_wrapped(&ctx->swdev, ctx->base.hal)) {
#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) {
}
#endif
if (!ctx->base.ref) {