fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

{st,targets}/xa: use static/dynamic pipe-loader

Browse source 
Analogous to previous commits.

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-10-15 00:43:52 +01:00
parent 1eb6e8a23c
commit 611ef64ed5
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/state_trackers/xa/Makefile.am
View file

@ -28,11 +28,6 @@ AM_CFLAGS = \
$(GALLIUM_CFLAGS) \
$(VISIBILITY_CFLAGS)
if HAVE_GALLIUM_STATIC_TARGETS
AM_CPPFLAGS = \
-DGALLIUM_STATIC_TARGETS=1
endif
xa_includedir = $(includedir)
xa_include_HEADERS = \
xa_composite.h \

16
src/gallium/state_trackers/xa/xa_tracker.c
View file

@ -152,21 +152,13 @@ xa_tracker_create(int drm_fd)
struct xa_tracker *xa = calloc(1, sizeof(struct xa_tracker));
enum xa_surface_type stype;
unsigned int num_formats;
int loader_fd;
if (!xa)
return NULL;
#if GALLIUM_STATIC_TARGETS
xa->screen = dd_create_screen(drm_fd);
(void) loader_fd; /* silence unused var warning */
#else
loader_fd = dup(drm_fd);
if (loader_fd == -1)
return NULL;
if (pipe_loader_drm_probe_fd(&xa->dev, loader_fd))
if (pipe_loader_drm_probe_fd(&xa->dev, dup(drm_fd)))
xa->screen = pipe_loader_create_screen(xa->dev);
#endif
if (!xa->screen)
goto out_no_screen;
@ -214,10 +206,8 @@ xa_tracker_create(int drm_fd)
out_no_pipe:
xa->screen->destroy(xa->screen);
out_no_screen:
#if !GALLIUM_STATIC_TARGETS
if (xa->dev)
pipe_loader_release(&xa->dev, 1);
#endif
free(xa);
return NULL;
}
@ -228,9 +218,7 @@ xa_tracker_destroy(struct xa_tracker *xa)
free(xa->supported_formats);
xa_context_destroy(xa->default_ctx);
xa->screen->destroy(xa->screen);
#if !GALLIUM_STATIC_TARGETS
pipe_loader_release(&xa->dev, 1);
#endif
free(xa);
}

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

@ -60,7 +60,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/i915/Automake.inc
@ -74,7 +74,10 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
libxatracker_la_SOURCES += target.c
libxatracker_la_CPPFLAGS = $(TARGET_CPPFLAGS)
libxatracker_la_LIBADD += $(TARGET_LIB_DEPS)
libxatracker_la_LIBADD += \
$(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_static.la \
$(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \
$(TARGET_LIB_DEPS)
else # HAVE_GALLIUM_STATIC_TARGETS

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

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