diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2015-11-20 18:02:12 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-11-21 12:52:20 +0000 |
| commit | 1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d (patch) | |
| tree | 3b82be43b9e6d76e831cf5dfb1aa80f2b8c394a3 /src/gallium/auxiliary | |
| parent | 23fb11455b415238fb9e378fa0ab51f4b6cefd7a (diff) | |
| download | external_mesa3d-1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d.zip external_mesa3d-1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d.tar.gz external_mesa3d-1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d.tar.bz2 | |
{auxiliary,targets}/vl: use static/dynamic pipe-loader
Analogous to previous commit.
v2: rebase on top of vl_winsys_drm.c addition
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Clark <robclark@freedesktop.org>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_dri.c | 8 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_drm.c | 11 |
3 files changed, 1 insertions, 24 deletions
diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am index 7ff8972..ee296ce 100644 --- a/src/gallium/auxiliary/Makefile.am +++ b/src/gallium/auxiliary/Makefile.am @@ -64,12 +64,6 @@ COMMON_VL_CFLAGS = \ $(DRI2PROTO_CFLAGS) \ $(LIBDRM_CFLAGS) -if HAVE_GALLIUM_STATIC_TARGETS -COMMON_VL_CFLAGS += \ - -DGALLIUM_STATIC_TARGETS=1 - -endif # HAVE_GALLIUM_STATIC_TARGETS - noinst_LTLIBRARIES += libgalliumvl.la libgalliumvl_la_CFLAGS = \ diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c index fb16adc..c4f9295 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_dri.c +++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c @@ -402,12 +402,8 @@ vl_dri2_screen_create(Display *display, int screen) if (authenticate == NULL || !authenticate->authenticated) goto free_authenticate; -#if GALLIUM_STATIC_TARGETS - scrn->base.pscreen = dd_create_screen(fd); -#else if (pipe_loader_drm_probe_fd(&scrn->base.dev, fd)) scrn->base.pscreen = pipe_loader_create_screen(scrn->base.dev); -#endif // GALLIUM_STATIC_TARGETS if (!scrn->base.pscreen) goto release_pipe; @@ -430,10 +426,8 @@ vl_dri2_screen_create(Display *display, int screen) return &scrn->base; release_pipe: -#if !GALLIUM_STATIC_TARGETS if (scrn->base.dev) pipe_loader_release(&scrn->base.dev, 1); -#endif // !GALLIUM_STATIC_TARGETS free_authenticate: free(authenticate); free_connect: @@ -462,8 +456,6 @@ vl_dri2_screen_destroy(struct vl_screen *vscreen) vl_dri2_destroy_drawable(scrn); scrn->base.pscreen->destroy(scrn->base.pscreen); -#if !GALLIUM_STATIC_TARGETS pipe_loader_release(&scrn->base.dev, 1); -#endif // !GALLIUM_STATIC_TARGETS FREE(scrn); } diff --git a/src/gallium/auxiliary/vl/vl_winsys_drm.c b/src/gallium/auxiliary/vl/vl_winsys_drm.c index f4e8306..f993e2c 100644 --- a/src/gallium/auxiliary/vl/vl_winsys_drm.c +++ b/src/gallium/auxiliary/vl/vl_winsys_drm.c @@ -46,12 +46,8 @@ vl_drm_screen_create(int fd) if (!vscreen) return NULL; -#if GALLIUM_STATIC_TARGETS - vscreen->pscreen = dd_create_screen(fd); -#else if (pipe_loader_drm_probe_fd(&vscreen->dev, dup(fd))) vscreen->pscreen = pipe_loader_create_screen(vscreen->dev); -#endif if (!vscreen->pscreen) goto error; @@ -65,10 +61,9 @@ vl_drm_screen_create(int fd) return vscreen; error: -#if !GALLIUM_STATIC_TARGETS if (vscreen->dev) pipe_loader_release(&vscreen->dev, 1); -#endif // !GALLIUM_STATIC_TARGETS + FREE(vscreen); return NULL; } @@ -79,10 +74,6 @@ vl_drm_screen_destroy(struct vl_screen *vscreen) assert(vscreen); vscreen->pscreen->destroy(vscreen->pscreen); - -#if !GALLIUM_STATIC_TARGETS pipe_loader_release(&vscreen->dev, 1); -#endif - FREE(vscreen); } |