diff options
author | Emil Velikov <[email protected]> | 2014-09-24 10:39:20 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-09-24 10:43:44 +0100 |
commit | 6e1f846ce09e93d2a6157da1587b546080e48211 (patch) | |
tree | 645fb484c19576155af973081d71e56ac285bb31 | |
parent | 18137c5fe092afb2812d32fd2c121aa29ad702de (diff) |
targets/pipe-loader: drop unused authentication
The dri, vdpau, omx, xvmc and gbm targets don't need any authentication
even the VL ones never used it. Either the respective loader or the
library itself (vl) is doing its auth prior to calling create_screen()
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>
-rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/dri/dri2.c | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/gbm/gbm_drm.c | 2 | ||||
-rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 6 | ||||
-rw-r--r-- | src/gallium/targets/omx/Makefile.am | 1 | ||||
-rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 1 |
6 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index b5c981b897e..7e61b88e6b5 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -379,7 +379,7 @@ vl_screen_create(Display *display, int screen) #if GALLIUM_STATIC_TARGETS scrn->base.pscreen = dd_create_screen(fd); #else - if (pipe_loader_drm_probe_fd(&scrn->base.dev, fd, true)) + if (pipe_loader_drm_probe_fd(&scrn->base.dev, fd, false)) scrn->base.pscreen = pipe_loader_create_screen(scrn->base.dev, PIPE_SEARCH_DIR); #endif // GALLIUM_STATIC_TARGETS diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index 24c753ab001..aecc8eb1322 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1264,7 +1264,7 @@ dri2_init_screen(__DRIscreen * sPriv) throttle_ret = dd_configuration(DRM_CONF_THROTTLE); dmabuf_ret = dd_configuration(DRM_CONF_SHARE_FD); #else - if (pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true)) { + if (pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false)) { pscreen = pipe_loader_create_screen(screen->dev, PIPE_SEARCH_DIR); throttle_ret = pipe_loader_configuration(screen->dev, DRM_CONF_THROTTLE); diff --git a/src/gallium/state_trackers/gbm/gbm_drm.c b/src/gallium/state_trackers/gbm/gbm_drm.c index 95b07eff901..bba3c05f4c6 100644 --- a/src/gallium/state_trackers/gbm/gbm_drm.c +++ b/src/gallium/state_trackers/gbm/gbm_drm.c @@ -273,7 +273,7 @@ gbm_gallium_drm_device_create(int fd) gdrm->screen = dd_create_screen(gdrm->base.base.fd); #else #ifdef HAVE_PIPE_LOADER_DRM - if (pipe_loader_drm_probe_fd(&gdrm->dev, gdrm->base.base.fd, true)) + if (pipe_loader_drm_probe_fd(&gdrm->dev, gdrm->base.base.fd, false)) gdrm->screen = pipe_loader_create_screen(gdrm->dev, get_library_search_path()); #endif /* HAVE_PIPE_LOADER_DRM */ diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 31a8b47c1e4..34fd24379c0 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -133,9 +133,9 @@ gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) else # HAVE_GALLIUM_STATIC_TARGETS gbm_gallium_drm_la_LIBADD += \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ - $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ + $(GALLIUM_PIPE_LOADER_LIBS) endif # HAVE_GALLIUM_STATIC_TARGETS diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 4045548c880..88b0711d961 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -84,7 +84,6 @@ libomx_mesa_la_CPPFLAGS = \ $(GALLIUM_PIPE_LOADER_DEFINES) \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" -# XXX: Use the pipe-loader-client over pipe-loader ? libomx_mesa_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 4d234fbab8c..96ad039a9d9 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -95,7 +95,6 @@ libvdpau_gallium_la_CPPFLAGS = \ $(GALLIUM_PIPE_LOADER_DEFINES) \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" -# XXX: Use the pipe-loader-client over pipe-loader ? libvdpau_gallium_la_LIBADD += \ $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader.la \ $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ |