fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

{auxiliary,targets}/vl: use static/dynamic pipe-loader

Browse source 
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>
This commit is contained in:
Emil Velikov 2015-11-20 18:02:12 +00:00
parent 23fb11455b
commit 1eb6e8a23c
11 changed files with 25 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/auxiliary/Makefile.am
View file

@ -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 = \

8
src/gallium/auxiliary/vl/vl_winsys_dri.c
View file

@ -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);
}

11
src/gallium/auxiliary/vl/vl_winsys_drm.c
View file

@ -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);
}

7
src/gallium/targets/omx/Makefile.am
View file

@ -40,7 +40,7 @@ if HAVE_GALLIUM_STATIC_TARGETS
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
TARGET_LIB_DEPS =
include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
@ -50,7 +50,10 @@ include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
libomx_mesa_la_SOURCES += target.c
libomx_mesa_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libomx_mesa_la_LIBADD += $(TARGET_LIB_DEPS) \
libomx_mesa_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

2
src/gallium/targets/omx/target.c
View file

@ -1 +1 @@
#include "target-helpers/inline_drm_helper.h"
#include "target-helpers/drm_helper.h"

7
src/gallium/targets/va/Makefile.am
View file

@ -40,14 +40,17 @@ if HAVE_GALLIUM_STATIC_TARGETS
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
TARGET_LIB_DEPS =
include $(top_srcdir)/src/gallium/drivers/r600/Automake.inc
include $(top_srcdir)/src/gallium/drivers/radeonsi/Automake.inc
gallium_drv_video_la_SOURCES += target.c
gallium_drv_video_la_CPPFLAGS = $(TARGET_CPPFLAGS)
gallium_drv_video_la_LIBADD += $(TARGET_LIB_DEPS) \
gallium_drv_video_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

2
src/gallium/targets/va/target.c
View file

@ -1 +1 @@
#include "target-helpers/inline_drm_helper.h"
#include "target-helpers/drm_helper.h"

7
src/gallium/targets/vdpau/Makefile.am
View file

@ -47,7 +47,7 @@ EXTRA_DIST = \
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
TARGET_LIB_DEPS =
include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
@ -59,7 +59,10 @@ if HAVE_GALLIUM_STATIC_TARGETS
libvdpau_gallium_la_SOURCES += target.c
libvdpau_gallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libvdpau_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
libvdpau_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

2
src/gallium/targets/vdpau/target.c
View file

@ -1 +1 @@
#include "target-helpers/inline_drm_helper.h"
#include "target-helpers/drm_helper.h"

7
src/gallium/targets/xvmc/Makefile.am
View file

@ -38,7 +38,7 @@ EXTRA_DIST = xvmc.sym
TARGET_DRIVERS =
TARGET_CPPFLAGS =
TARGET_LIB_DEPS = $(top_builddir)/src/loader/libloader.la
TARGET_LIB_DEPS =
include $(top_srcdir)/src/gallium/drivers/nouveau/Automake.inc
@ -48,7 +48,10 @@ if HAVE_GALLIUM_STATIC_TARGETS
libXvMCgallium_la_SOURCES += target.c
libXvMCgallium_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libXvMCgallium_la_LIBADD += $(TARGET_LIB_DEPS) \
libXvMCgallium_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
else # HAVE_GALLIUM_STATIC_TARGETS

2
src/gallium/targets/xvmc/target.c
View file

@ -1 +1 @@
#include "target-helpers/inline_drm_helper.h"
#include "target-helpers/drm_helper.h"