fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/targets: Make use of prebuilt libdricommon.la.

Browse source 
libdricommon.la is available whenever a non swrast driver is built.
All the classic dri drivers make use of the prebuild library but all
of the gallium ones rebuild it explicitly.

While we're here gallium/{llvm,soft}pipe does not require HAVE_COMMON_DRI
thus do not set in during configure.

v2: [Emil] Add commit message and drop HAVE_COMMON_DRI from configure.ac
v3: [Emil] Rebase and resolve targets/r*/dri conflicts

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Johannes Obermayr 2013-09-17 18:09:02 +01:00 • committed by Tom Stellard
parent eb0a57acaa
commit cb1febb074
9 changed files with 17 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -1824,7 +1824,6 @@ if test "x$with_gallium_drivers" != x; then
if test "x$enable_dri" = xyes; then if test "x$enable_dri" = xyes; then
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
HAVE_COMMON_DRI=yes
fi fi
if test "x$enable_vdpau" = xyes; then if test "x$enable_vdpau" = xyes; then
GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS vdpau-softpipe" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS vdpau-softpipe"

10
src/gallium/targets/dri-freedreno/Makefile.am
View file

@ -39,14 +39,10 @@ AM_CPPFLAGS = \
dridir = $(DRI_DRIVER_INSTALL_DIR) dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = kgsl_dri.la msm_dri.la dri_LTLIBRARIES = kgsl_dri.la msm_dri.la
COMMON_SOURCES = \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
COMMON_LDFLAGS = -module -avoid-version -shared -no-undefined COMMON_LDFLAGS = -module -avoid-version -shared -no-undefined
COMMON_LIBADD = \ COMMON_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \
@ -65,12 +61,12 @@ COMMON_LIBADD += $(LLVM_LIBS)
endif endif
nodist_EXTRA_kgsl_dri_la_SOURCES = dummy.cpp nodist_EXTRA_kgsl_dri_la_SOURCES = dummy.cpp
kgsl_dri_la_SOURCES = target-kgsl.c $(COMMON_SOURCES) kgsl_dri_la_SOURCES = target-kgsl.c
kgsl_dri_la_LDFLAGS = $(COMMON_LDFLAGS) kgsl_dri_la_LDFLAGS = $(COMMON_LDFLAGS)
kgsl_dri_la_LIBADD = $(COMMON_LIBADD) kgsl_dri_la_LIBADD = $(COMMON_LIBADD)
nodist_EXTRA_msm_dri_la_SOURCES = dummy.cpp nodist_EXTRA_msm_dri_la_SOURCES = dummy.cpp
msm_dri_la_SOURCES = target-msm.c $(COMMON_SOURCES) msm_dri_la_SOURCES = target-msm.c
msm_dri_la_LDFLAGS = $(COMMON_LDFLAGS) msm_dri_la_LDFLAGS = $(COMMON_LDFLAGS)
msm_dri_la_LIBADD = $(COMMON_LIBADD) msm_dri_la_LIBADD = $(COMMON_LIBADD)

7
src/gallium/targets/dri-i915/Makefile.am
View file

@ -40,15 +40,12 @@ AM_CPPFLAGS = \
dridir = $(DRI_DRIVER_INSTALL_DIR) dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = i915_dri.la dri_LTLIBRARIES = i915_dri.la
i915_dri_la_SOURCES = \ i915_dri_la_SOURCES = target.c
target.c \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
i915_dri_la_LIBADD = \ i915_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \

7
src/gallium/targets/dri-ilo/Makefile.am
View file

@ -39,17 +39,14 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = ilo_dri.la noinst_LTLIBRARIES = ilo_dri.la
ilo_dri_la_SOURCES = \ ilo_dri_la_SOURCES = target.c
target.c \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
# need -rpath to create a noinst shared library # need -rpath to create a noinst shared library
ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \ ilo_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined \
-rpath $(abs_builddir) -rpath $(abs_builddir)
ilo_dri_la_LIBADD = \ ilo_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \

7
src/gallium/targets/dri-nouveau/Makefile.am
View file

@ -39,15 +39,12 @@ dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = nouveau_dri.la dri_LTLIBRARIES = nouveau_dri.la
nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp
nouveau_dri_la_SOURCES = \ nouveau_dri_la_SOURCES = target.c
target.c \
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
nouveau_dri_la_LIBADD = \ nouveau_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \

6
src/gallium/targets/dri-vmwgfx/Makefile.am
View file

@ -40,14 +40,12 @@ dri_LTLIBRARIES = vmwgfx_dri.la
vmwgfx_dri_la_SOURCES = \ vmwgfx_dri_la_SOURCES = \
target.c \ target.c \
vmw_powf.c \ vmw_powf.c
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
vmwgfx_dri_la_LIBADD = \ vmwgfx_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \

6
src/gallium/targets/r300/dri/Makefile.am
View file

@ -41,14 +41,12 @@ dri_LTLIBRARIES = r300_dri.la
nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
r300_dri_la_SOURCES = \ r300_dri_la_SOURCES = \
../drm_target.c \ ../drm_target.c
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
r300_dri_la_LIBADD = \ r300_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \

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

@ -40,14 +40,12 @@ dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = r600_dri.la dri_LTLIBRARIES = r600_dri.la
r600_dri_la_SOURCES = \ r600_dri_la_SOURCES = \
../drm_target.c \ ../drm_target.c
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
r600_dri_la_LIBADD = \ r600_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \ $(top_builddir)/src/gallium/drivers/r600/libr600.la \

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

@ -41,14 +41,12 @@ dri_LTLIBRARIES = radeonsi_dri.la
nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
radeonsi_dri_la_SOURCES = \ radeonsi_dri_la_SOURCES = \
../drm_target.c \ ../drm_target.c
$(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
$(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \
$(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
radeonsi_dri_la_LIBADD = \ radeonsi_dri_la_LIBADD = \
$(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
$(top_builddir)/src/mesa/libmesagallium.la \ $(top_builddir)/src/mesa/libmesagallium.la \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \