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

gallium/radeon: link in libradeon.la at target level

Browse source 
It makes more sense to link the core and common parts of the driver as the
target is build. Additionally this will help us drop duplicating symbols
for targets that static link mulitple pipe-drivers. Only egl-static needs
that currently with more to come.

To simplify things a bit add HAVE_GALLIUM_RADEON_COMMON variable.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Emil Velikov 2014-05-10 14:35:08 +01:00
parent 6fcc0b0ba5
commit d812c74582
13 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1967,6 +1967,8 @@ AM_CONDITIONAL(HAVE_GALLIUM_ILO, test "x$HAVE_GALLIUM_ILO" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_R300, test "x$HAVE_GALLIUM_R300" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_R600, test "x$HAVE_GALLIUM_R600" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_RADEONSI, test "x$HAVE_GALLIUM_RADEONSI" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_RADEON_COMMON, test "x$HAVE_GALLIUM_R600" = xyes -o \
"x$HAVE_GALLIUM_RADEONSI" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_NOUVEAU, test "x$HAVE_GALLIUM_NOUVEAU" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_FREEDRENO, test "x$HAVE_GALLIUM_FREEDRENO" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes)

24
src/gallium/drivers/Makefile.am
View file

@ -5,22 +5,6 @@ SUBDIRS = . galahad identity noop trace rbug
################################################################################
if HAVE_GALLIUM_R600
SUBDIRS += radeon
else
if HAVE_GALLIUM_RADEONSI
SUBDIRS += radeon
endif
endif
################################################################################
if HAVE_GALLIUM_FREEDRENO
SUBDIRS += freedreno
@ -61,6 +45,14 @@ endif
################################################################################
if HAVE_GALLIUM_RADEON_COMMON
SUBDIRS += radeon
endif
################################################################################
if HAVE_GALLIUM_R300
SUBDIRS += r300

2
src/gallium/drivers/r600/Makefile.am
View file

@ -17,8 +17,6 @@ libr600_la_SOURCES = \
$(C_SOURCES) \
$(CXX_SOURCES)
libr600_la_LIBADD = ../radeon/libradeon.la
if NEED_RADEON_LLVM
AM_CFLAGS += \

2
src/gallium/drivers/radeonsi/Makefile.am
View file

@ -32,5 +32,3 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libradeonsi.la
libradeonsi_la_SOURCES = $(C_SOURCES)
libradeonsi_la_LIBADD = \
../radeon/libradeon.la

5
src/gallium/targets/egl-static/Makefile.am
View file

@ -183,6 +183,11 @@ egl_gallium_la_LIBADD += \
$(NOUVEAU_LIBS)
endif
if HAVE_GALLIUM_RADEON_COMMON
egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la
endif
if HAVE_GALLIUM_R300
AM_CPPFLAGS += -D_EGL_PIPE_R300=1
egl_gallium_la_LIBADD += \

2
src/gallium/targets/pipe-loader/Makefile.am
View file

@ -107,6 +107,7 @@ nodist_EXTRA_pipe_r600_la_SOURCES = dummy.cpp
pipe_r600_la_LIBADD = \
$(PIPE_LIBS) \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(LIBDRM_LIBS) \
$(RADEON_LIBS)
@ -121,6 +122,7 @@ nodist_EXTRA_pipe_radeonsi_la_SOURCES = dummy.cpp
pipe_radeonsi_la_LIBADD = \
$(PIPE_LIBS) \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(LIBDRM_LIBS) \
$(RADEON_LIBS)

1
src/gallium/targets/r600/dri/Makefile.am
View file

@ -42,6 +42,7 @@ r600_dri_la_LDFLAGS = \
r600_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \

1
src/gallium/targets/r600/omx/Makefile.am
View file

@ -36,6 +36,7 @@ libomx_r600_la_SOURCES = \
libomx_r600_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS)
libomx_r600_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(GALLIUM_OMX_LIB_DEPS) \

1
src/gallium/targets/r600/vdpau/Makefile.am
View file

@ -38,6 +38,7 @@ libvdpau_r600_la_LDFLAGS = \
-Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
libvdpau_r600_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(GALLIUM_VDPAU_LIB_DEPS) \

1
src/gallium/targets/r600/xvmc/Makefile.am
View file

@ -37,6 +37,7 @@ libXvMCr600_la_LDFLAGS = \
$(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCr600_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(GALLIUM_XVMC_LIB_DEPS) \

1
src/gallium/targets/radeonsi/dri/Makefile.am
View file

@ -42,6 +42,7 @@ radeonsi_dri_la_LDFLAGS = \
radeonsi_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \

1
src/gallium/targets/radeonsi/omx/Makefile.am
View file

@ -36,6 +36,7 @@ libomx_radeonsi_la_SOURCES = \
libomx_radeonsi_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS)
libomx_radeonsi_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(GALLIUM_OMX_LIB_DEPS) \

1
src/gallium/targets/radeonsi/vdpau/Makefile.am
View file

@ -39,6 +39,7 @@ libvdpau_radeonsi_la_LDFLAGS = \
libvdpau_radeonsi_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(GALLIUM_VDPAU_LIB_DEPS) \