diff options
| author | Emil Velikov <[email protected]> | 2014-06-21 12:31:47 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-06-22 23:06:01 +0100 |
| commit | 291d70210dd249c663f8c3b92ac9cf47335630bd (patch) | |
| tree | 55a1c4fa298fd6ebb9fbd83997536a57bb62572f /src/gallium/targets/vdpau | |
| parent | f85e7ce057afc8d31ae78ad85cb41600c18615a0 (diff) | |
targets/radeonsi/vdpau: convert to static/shared pipe-drivers
Similar to previous commits, this allows us to minimise some
of the duplication by compacting all vdpau targets into a
single library.
v2: Include the radeon winsys only when there is a user for it.
v3: Correcly include the winsys. Now with extra brown bag :\
Cc: Christian König <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Christian König <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Diffstat (limited to 'src/gallium/targets/vdpau')
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index b30d1939cc5..a257db87c28 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -52,6 +52,11 @@ endif if HAVE_GALLIUM_R600 STATIC_TARGET_LIB_DEPS += \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +else +if HAVE_GALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la +endif endif if HAVE_GALLIUM_RADEON_COMMON @@ -67,6 +72,14 @@ STATIC_TARGET_LIB_DEPS += \ $(RADEON_LIBS) endif +if HAVE_GALLIUM_RADEONSI +MEGADRIVERS += radeonsi +STATIC_TARGET_CPPFLAGS += -DGALLIUM_RADEONSI +STATIC_TARGET_LIB_DEPS += \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) +endif + libvdpau_gallium_la_SOURCES += target.c libvdpau_gallium_la_CPPFLAGS = $(STATIC_TARGET_CPPFLAGS) libvdpau_gallium_la_LIBADD += $(STATIC_TARGET_LIB_DEPS) |