summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/vl
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-11-20 18:02:12 +0000
committerEmil Velikov <[email protected]>2015-11-21 12:52:20 +0000
commit1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d (patch)
tree3b82be43b9e6d76e831cf5dfb1aa80f2b8c394a3 /src/gallium/auxiliary/vl
parent23fb11455b415238fb9e378fa0ab51f4b6cefd7a (diff)
{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 <[email protected]> Acked-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/vl')
-rw-r--r--src/gallium/auxiliary/vl/vl_winsys_dri.c8
-rw-r--r--src/gallium/auxiliary/vl/vl_winsys_drm.c11
2 files changed, 1 insertions, 18 deletions
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index fb16adc966c..c4f9295271f 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 f4e8306b67c..f993e2c7727 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);
}