diff options
author | Emil Velikov <[email protected]> | 2015-11-20 18:02:12 +0000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2015-11-21 12:52:20 +0000 |
commit | 1eb6e8a23cc29081105336dc2a1cbf6bb4c2603d (patch) | |
tree | 3b82be43b9e6d76e831cf5dfb1aa80f2b8c394a3 /src/gallium/auxiliary/vl/vl_winsys_drm.c | |
parent | 23fb11455b415238fb9e378fa0ab51f4b6cefd7a (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/vl_winsys_drm.c')
-rw-r--r-- | src/gallium/auxiliary/vl/vl_winsys_drm.c | 11 |
1 files changed, 1 insertions, 10 deletions
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); } |