Make DRI dependencies and build depend on the target

Graphics / Mesa 3D Graphics Library / Mesa - Jon TURNEY [dronecode.org.uk] - 23 May 2014 09:24 UTC

- 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

45f9aae Make DRI dependencies and build depend on the target
configure.ac | 55 ++++++++++++++++++++--------
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 +-
src/gbm/Makefile.am | 2 +-
src/glx/Makefile.am | 28 +++++++++++---
src/glx/tests/Makefile.am | 6 ++-
src/mesa/Makefile.am | 2 +-
13 files changed, 88 insertions(+), 41 deletions(-)

Upstream: cgit.freedesktop.org

  • Share