diff options
| author | Jon TURNEY <[email protected]> | 2014-05-12 10:17:06 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2014-05-23 15:24:04 +0100 |
| commit | 45f9aae004f7bd723c3f313ee3dd8a25aa420ffa (patch) | |
| tree | 1dc94055f8be1c6bfbc8671c914cea2f0c5d1681 /src/gallium/targets/Makefile.am | |
| parent | ff90a8784cf22ada7bba75f90460b063818abda7 (diff) | |
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 <[email protected]>
Reviewed-by: Jeremy Huddleston Sequoia <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/Makefile.am')
| -rw-r--r-- | src/gallium/targets/Makefile.am | 18 |
1 files changed, 9 insertions, 9 deletions
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 |