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 <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index b5c981b897e7fc937b99b7fcefd243e0b3ee55c1..7e61b88e6b5b7758adf99e4ff877809ddf7eab80 100644 (file)
--- 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 24c753ab0016bd66b4217609ac33dd35d182b8b5..aecc8eb132274a020a7c585427b1594545070543 100644 (file)
--- 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 95b07eff901d597163527c15a884adeddba76436..bba3c05f4c67fbb917a6b8f039af68790f5c09e4 100644 (file)
--- 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 31a8b47c1e4438a0deb211773703576485ca973e..34fd24379c0331b331a0be0194c31c6f2c33e04f 100644 (file)
--- 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 4045548c88097b7dfa7c3a7586c1300b6b302c7d..88b0711d9618ff5866a63b47b4b98d7c7da163d0 100644 (file)
--- 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 4d234fbab8c053c347cc9d78959d69074f7b118c..96ad039a9d90dd1b9e05ad2e803bb013e43ce892 100644 (file)
--- 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) \