summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/xa
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-10-14 16:37:37 +0100
committerEmil Velikov <[email protected]>2015-11-21 12:52:18 +0000
commit74d41a32bc179425e866f8afa33a222488ea7760 (patch)
tree7f3c766ab1585845c4bb7b635d698adaebcb4427 /src/gallium/state_trackers/xa
parentcbc4d9730a7c48744fe7ac62d55b40a80e8fc2e2 (diff)
gallium: remove library_path argument from pipe_loader_create_screen()
Currently the location is determined at configure/build time and consistently copied across gallium. Just remove the extra argument, and use PIPE_SEARCH_DIR where appropriate. This will allow us to remove the duplication in the *configuration and *screen_create APIs by moving util_dl_get_proc_address() and friends to probe time. v2: rebase on top of vl_winsys_drm.c addition Signed-off-by: Emil Velikov <[email protected]> Acked-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/xa')
-rw-r--r--src/gallium/state_trackers/xa/Makefile.am5
-rw-r--r--src/gallium/state_trackers/xa/xa_tracker.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/xa/Makefile.am b/src/gallium/state_trackers/xa/Makefile.am
index 400a70b300f..0d50c27253b 100644
--- a/src/gallium/state_trackers/xa/Makefile.am
+++ b/src/gallium/state_trackers/xa/Makefile.am
@@ -28,11 +28,8 @@ AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
$(VISIBILITY_CFLAGS)
-AM_CPPFLAGS = \
- -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\"
-
if HAVE_GALLIUM_STATIC_TARGETS
-AM_CPPFLAGS += \
+AM_CPPFLAGS = \
-DGALLIUM_STATIC_TARGETS=1
endif
diff --git a/src/gallium/state_trackers/xa/xa_tracker.c b/src/gallium/state_trackers/xa/xa_tracker.c
index 4fdbdc96ae6..3011598e0d9 100644
--- a/src/gallium/state_trackers/xa/xa_tracker.c
+++ b/src/gallium/state_trackers/xa/xa_tracker.c
@@ -165,7 +165,7 @@ xa_tracker_create(int drm_fd)
if (loader_fd == -1)
return NULL;
if (pipe_loader_drm_probe_fd(&xa->dev, loader_fd))
- xa->screen = pipe_loader_create_screen(xa->dev, PIPE_SEARCH_DIR);
+ xa->screen = pipe_loader_create_screen(xa->dev);
#endif
if (!xa->screen)
goto out_no_screen;