From 7689aa28cdb18844f093942f084fddc91d25bc1e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 21 Jun 2014 12:44:30 +0100 Subject: targets/gbm: convert to static/shared pipe-driver Move the gbm "target" code to the state-tracker, similar to other - dri, omx, vdpau... ST. v2: Drop inclusion of the wrapper winsys and softpipe/llvmpipe. Cc: Chia-I Wu Signed-off-by: Emil Velikov --- src/gallium/targets/gbm/Makefile.am | 110 ++++++++++++++++++++++++++++++------ 1 file changed, 93 insertions(+), 17 deletions(-) (limited to 'src/gallium/targets/gbm/Makefile.am') diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index 6f2a792dc10..2345ce30636 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -22,32 +22,18 @@ include $(top_srcdir)/src/gallium/Automake.inc -gbmdir = $(libdir)/gbm - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/gallium/state_trackers/gbm \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src/gallium/winsys \ - $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" - AM_CFLAGS = \ - $(GALLIUM_CFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(LIBDRM_CFLAGS) + $(GALLIUM_TARGET_CFLAGS) +gbmdir = $(libdir)/gbm gbm_LTLIBRARIES = gbm_gallium_drm.la nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp -gbm_gallium_drm_la_SOURCES = gbm.c +gbm_gallium_drm_la_SOURCES = gbm_gallium_drm_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ $(top_builddir)/src/gallium/state_trackers/gbm/libgbm.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) \ - $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) @@ -63,6 +49,96 @@ gbm_gallium_drm_la_LDFLAGS += \ -Wl,--version-script=$(top_srcdir)/src/gallium/targets/gbm/gbm.sym endif +if HAVE_GALLIUM_STATIC_TARGETS + +STATIC_TARGET_CPPFLAGS = +STATIC_TARGET_LIB_DEPS = \ + $(top_builddir)/src/loader/libloader.la + +if HAVE_GALLIUM_I915 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_I915 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ + $(top_builddir)/src/gallium/drivers/i915/libi915.la \ + $(INTEL_LIBS) +endif + +if HAVE_GALLIUM_ILO +STATIC_TARGET_CPPFLAGS += -DGALLIUM_ILO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/intel/drm/libintelwinsys.la \ + $(top_builddir)/src/gallium/drivers/ilo/libilo.la \ + $(INTEL_LIBS) +endif + +if HAVE_GALLIUM_NOUVEAU +STATIC_TARGET_CPPFLAGS += -DGALLIUM_NOUVEAU +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ + $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ + $(NOUVEAU_LIBS) +endif + +if NEED_RADEON_DRM_WINSYS +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +endif + +if HAVE_GALLIUM_RADEON_COMMON +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeon/libradeon.la +endif + +if HAVE_GALLIUM_R300 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R300 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r300/libr300.la \ + $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_R600 +STATIC_TARGET_CPPFLAGS += -DGALLIUM_R600 +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_RADEONSI +STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_SVGA +STATIC_TARGET_CPPFLAGS += -DGALLIUM_VMWGFX +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ + $(top_builddir)/src/gallium/drivers/svga/libsvga.la +endif + +if HAVE_GALLIUM_FREEDRENO +STATIC_TARGET_CPPFLAGS += -DGALLIUM_FREEDRENO +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/freedreno/drm/libfreedrenodrm.la \ + $(top_builddir)/src/gallium/drivers/freedreno/libfreedreno.la \ + $(FREEDRENO_LIBS) + +endif + +gbm_gallium_drm_la_SOURCES += target.c +gbm_gallium_drm_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) +gbm_gallium_drm_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) + +else # HAVE_GALLIUM_STATIC_TARGETS +gbm_gallium_drm_la_LIBADD += \ + $(top_builddir)/src/gallium/auxiliary/pipe-loader/libpipe_loader_client.la \ + $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ + $(GALLIUM_PIPE_LOADER_WINSYS_LIBS) + +endif # HAVE_GALLIUM_STATIC_TARGETS + if HAVE_MESA_LLVM gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) -- cgit v1.2.3