From 45f9aae004f7bd723c3f313ee3dd8a25aa420ffa Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 12 May 2014 10:17:06 +0100 Subject: Make DRI dependencies and build depend on the target - Don't require xcb-dri[23] etc. if we aren't building for a target with DRM, as we won't be using dri[23] - Enable a more fine-grained control of what DRI code is built, so that a libGL using direct swrast can be built on targets which don't have DRM. The HAVE_DRI automake conditional is retired in favour of a number of other conditionals: HAVE_DRI2 enables building of code using the DRI2 interface (and possibly DRI3 with HAVE_DRI3) HAVE_DRISW enables building of DRI swrast HAVE_DRICOMMON enables building of target-independent DRI code, and also enables some makefile cases where a more detailled decision is made at a lower level. HAVE_APPLEDRI enables building of an Apple-specific direct rendering interface, still which requires additional fixing up to build properly. v2: Place xfont.c and drisw_glx.c into correct categories. Update 'make check' as well Signed-off-by: Jon TURNEY Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Emil Velikov --- src/gallium/state_trackers/Makefile.am | 2 +- src/gallium/state_trackers/dri/Makefile.am | 6 +++++- src/gallium/targets/Makefile.am | 18 +++++++++--------- src/gallium/targets/gbm/Makefile.am | 2 +- src/gallium/targets/opencl/Makefile.am | 2 +- src/gallium/targets/xa/Makefile.am | 2 +- src/gallium/tests/trivial/Makefile.am | 2 +- src/gallium/winsys/Makefile.am | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am index 209856041ee..3ced6adb482 100644 --- a/src/gallium/state_trackers/Makefile.am +++ b/src/gallium/state_trackers/Makefile.am @@ -29,7 +29,7 @@ if HAVE_GALLIUM_OSMESA SUBDIRS += osmesa endif -if HAVE_DRI +if HAVE_DRICOMMON SUBDIRS += dri endif diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index 9428b555512..b89d02f2a2b 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -20,7 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -SUBDIRS = sw +SUBDIRS = + +if HAVE_DRISW +SUBDIRS += sw +endif if HAVE_LIBDRM SUBDIRS += drm diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am index 5023dbc3bff..36d359ce772 100644 --- a/src/gallium/targets/Makefile.am +++ b/src/gallium/targets/Makefile.am @@ -43,37 +43,37 @@ SUBDIRS += opencl endif if HAVE_GALLIUM_SVGA -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += dri-vmwgfx endif endif if HAVE_GALLIUM_FREEDRENO -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += dri-freedreno endif endif if HAVE_GALLIUM_I915 -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += dri-i915 endif endif if HAVE_GALLIUM_ILO -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += dri-ilo endif endif if HAVE_GALLIUM_R300 -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += r300/dri endif endif if HAVE_GALLIUM_R600 -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += r600/dri endif @@ -91,7 +91,7 @@ endif endif if HAVE_GALLIUM_RADEONSI -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += radeonsi/dri endif @@ -105,7 +105,7 @@ endif endif if HAVE_GALLIUM_NOUVEAU -if HAVE_DRI +if HAVE_DRI2 SUBDIRS += dri-nouveau endif @@ -123,7 +123,7 @@ endif endif if HAVE_GALLIUM_SOFTPIPE -if HAVE_DRI +if HAVE_DRISW SUBDIRS += dri-swrast endif endif diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index bfc03073b3c..ccfddacd865 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -51,7 +51,7 @@ gbm_gallium_drm_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_DRI +if HAVE_DRISW gbm_gallium_drm_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am index f8c591d6281..55a73b49ecd 100644 --- a/src/gallium/targets/opencl/Makefile.am +++ b/src/gallium/targets/opencl/Makefile.am @@ -35,7 +35,7 @@ lib@OPENCL_LIBNAME@_la_LIBADD = \ -lclangBasic \ $(LLVM_LIBS) -if HAVE_DRI +if HAVE_DRISW lib@OPENCL_LIBNAME@_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif diff --git a/src/gallium/targets/xa/Makefile.am b/src/gallium/targets/xa/Makefile.am index 2619e57e142..0d3945430a1 100644 --- a/src/gallium/targets/xa/Makefile.am +++ b/src/gallium/targets/xa/Makefile.am @@ -48,7 +48,7 @@ libxatracker_la_LIBADD = \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_DRI +if HAVE_DRISW libxatracker_la_LIBADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am index d795ab164d7..8a8fad138e3 100644 --- a/src/gallium/tests/trivial/Makefile.am +++ b/src/gallium/tests/trivial/Makefile.am @@ -17,7 +17,7 @@ LDADD = $(GALLIUM_PIPE_LOADER_CLIENT_LIBS) \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(GALLIUM_COMMON_LIB_DEPS) -if HAVE_DRI +if HAVE_DRISW LDADD += \ $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la endif diff --git a/src/gallium/winsys/Makefile.am b/src/gallium/winsys/Makefile.am index ab1acc37b4a..7d7a0b11f7a 100644 --- a/src/gallium/winsys/Makefile.am +++ b/src/gallium/winsys/Makefile.am @@ -26,7 +26,7 @@ if NEED_WINSYS_XLIB SUBDIRS += sw/xlib endif -if HAVE_DRI +if HAVE_DRISW SUBDIRS += sw/dri endif -- cgit v1.2.3