X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configure.ac;h=3c614ea5c4dcb0ced41599ce0740353f4e9932e4;hb=6d43a4c33864ae66a92b1d893f4400b7fa7f8a41;hp=d94cc6f89394037b3c3a1c39664e57327d136cf9;hpb=dff5a219d01d290e5899ceb5a64b926cc5730c1e;p=mesa.git diff --git a/configure.ac b/configure.ac index d94cc6f8939..3c614ea5c4d 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_INIT([Mesa], [MESA_VERSION], AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign tar-ustar dist-xz]) # Support silent build rules, requires at least automake-1.11. Disable # by either passing --disable-silent-rules to configure or passing V=1 @@ -32,15 +32,17 @@ LIBDRM_RADEON_REQUIRED=2.4.56 LIBDRM_INTEL_REQUIRED=2.4.52 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41" -LIBDRM_FREEDRENO_REQUIRED=2.4.55 +LIBDRM_FREEDRENO_REQUIRED=2.4.57 DRI2PROTO_REQUIRED=2.6 DRI3PROTO_REQUIRED=1.0 PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 +LIBVA_REQUIRED=0.35.0 VDPAU_REQUIRED=0.4.1 WAYLAND_REQUIRED=1.2.0 +XCB_REQUIRED=1.9.3 XCBDRI2_REQUIRED=1.8 XCBGLX_REQUIRED=1.8.1 XSHMFENCE_REQUIRED=1.1 @@ -52,11 +54,13 @@ AC_PROG_CC AC_PROG_CXX AM_PROG_CC_C_O AM_PROG_AS -AC_CHECK_PROGS([MAKE], [gmake make]) +AX_CHECK_GNU_MAKE AC_CHECK_PROGS([PYTHON2], [python2 python]) AC_PROG_SED AC_PROG_MKDIR_P +AC_SYS_LARGEFILE + LT_PREREQ([2.2]) LT_INIT([disable-static]) @@ -67,13 +71,13 @@ AX_PROG_FLEX([], AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-lex.c"], [AC_MSG_ERROR([flex not found - unable to compile glcpp-lex.l])])) -AC_PATH_PROG([PERL], [perl]) - AC_CHECK_PROG(INDENT, indent, indent, cat) if test "x$INDENT" != "xcat"; then AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') fi +AX_CHECK_PYTHON_MAKO_MODULE(0.3.4) + AC_PROG_INSTALL dnl We need a POSIX shell for parts of the build. Assume we have one @@ -100,7 +104,7 @@ AC_COMPILE_IFELSE( AC_MSG_RESULT([$acv_mesa_CLANG]) -dnl If we're using GCC, make sure that it is at least version 3.3.0. Older +dnl If we're using GCC, make sure that it is at least version 4.2.0. Older dnl versions are explictly not supported. GEN_ASM_OFFSETS=no if test "x$GCC" = xyes -a "x$acv_mesa_CLANG" = xno; then @@ -114,9 +118,9 @@ if test "x$GCC" = xyes -a "x$acv_mesa_CLANG" = xno; then GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2` fi - if test $GCC_VERSION_MAJOR -lt 3 -o $GCC_VERSION_MAJOR -eq 3 -a $GCC_VERSION_MINOR -lt 3 ; then + if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 2 ; then AC_MSG_RESULT([no]) - AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.]) + AC_MSG_ERROR([If using GCC, version 4.2.0 or later is required.]) else AC_MSG_RESULT([yes]) fi @@ -129,6 +133,20 @@ fi dnl Check for compiler builtins AX_GCC_BUILTIN([__builtin_bswap32]) AX_GCC_BUILTIN([__builtin_bswap64]) +AX_GCC_BUILTIN([__builtin_clz]) +AX_GCC_BUILTIN([__builtin_clzll]) +AX_GCC_BUILTIN([__builtin_ctz]) +AX_GCC_BUILTIN([__builtin_expect]) +AX_GCC_BUILTIN([__builtin_ffs]) +AX_GCC_BUILTIN([__builtin_ffsll]) +AX_GCC_BUILTIN([__builtin_popcount]) +AX_GCC_BUILTIN([__builtin_popcountll]) +AX_GCC_BUILTIN([__builtin_unreachable]) + +AX_GCC_FUNC_ATTRIBUTE([flatten]) +AX_GCC_FUNC_ATTRIBUTE([format]) +AX_GCC_FUNC_ATTRIBUTE([malloc]) +AX_GCC_FUNC_ATTRIBUTE([packed]) AM_CONDITIONAL([GEN_ASM_OFFSETS], test "x$GEN_ASM_OFFSETS" = xyes) @@ -153,13 +171,13 @@ DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1" AC_SUBST([DEFINES]) case "$host_os" in linux*|*-gnu*|gnu*) - DEFINES="$DEFINES -D_GNU_SOURCE -DHAVE_PTHREAD" + DEFINES="$DEFINES -D_GNU_SOURCE" ;; solaris*) - DEFINES="$DEFINES -DHAVE_PTHREAD -DSVR4" + DEFINES="$DEFINES -DSVR4" ;; cygwin*) - DEFINES="$DEFINES -D_XOPEN_SOURCE=700 -DHAVE_PTHREAD" + DEFINES="$DEFINES -D_XOPEN_SOURCE=700" ;; esac @@ -237,11 +255,29 @@ AC_SUBST([VISIBILITY_CXXFLAGS]) dnl dnl Optional flags, check for compiler support dnl -AX_CHECK_COMPILE_FLAG([-msse4.1], [SSE41_SUPPORTED=1], [SSE41_SUPPORTED=0]) +SSE41_CFLAGS="-msse4.1" +dnl Code compiled by GCC with -msse* assumes a 16 byte aligned +dnl stack, but on x86-32 such alignment is not guaranteed. +case "$target_cpu" in +i?86) + SSE41_CFLAGS="$SSE41_CFLAGS -mstackrealign" + ;; +esac +save_CFLAGS="$CFLAGS" +CFLAGS="$SSE41_CFLAGS $CFLAGS" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#include +int main () { + __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c; + c = _mm_max_epu32(a, b); + return 0; +}]])], SSE41_SUPPORTED=1) +CFLAGS="$save_CFLAGS" if test "x$SSE41_SUPPORTED" = x1; then DEFINES="$DEFINES -DUSE_SSE41" fi AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1]) +AC_SUBST([SSE41_CFLAGS], $SSE41_CFLAGS) dnl Can't have static and shared libraries, default to static if user dnl explicitly requested. If both disabled, set to static since shared @@ -355,6 +391,24 @@ AC_LINK_IFELSE( LDFLAGS=$save_LDFLAGS AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") +dnl +dnl Check if linker supports dynamic list files +dnl +AC_MSG_CHECKING([if the linker supports --dynamic-list]) +save_LDFLAGS=$LDFLAGS +LDFLAGS="$LDFLAGS -Wl,--dynamic-list=conftest.dyn" +cat > conftest.dyn <@])], + [disable support for standard OpenGL API @<:@default=enabled@:>@])], [enable_opengl="$enableval"], [enable_opengl=yes]) AC_ARG_ENABLE([gles1], [AS_HELP_STRING([--enable-gles1], - [enable support for OpenGL ES 1.x API @<:@default=no@:>@])], + [enable support for OpenGL ES 1.x API @<:@default=disabled@:>@])], [enable_gles1="$enableval"], [enable_gles1=no]) AC_ARG_ENABLE([gles2], [AS_HELP_STRING([--enable-gles2], - [enable support for OpenGL ES 2.x API @<:@default=no@:>@])], + [enable support for OpenGL ES 2.x API @<:@default=disabled@:>@])], [enable_gles2="$enableval"], [enable_gles2=no]) AC_ARG_ENABLE([openvg], [AS_HELP_STRING([--enable-openvg], - [enable support for OpenVG API @<:@default=no@:>@])], + [enable support for OpenVG API @<:@default=disabled@:>@])], [enable_openvg="$enableval"], [enable_openvg=no]) @@ -616,7 +673,7 @@ AC_ARG_ENABLE([egl], AC_ARG_ENABLE([xa], [AS_HELP_STRING([--enable-xa], - [enable build of the XA X Acceleration API @<:@default=no@:>@])], + [enable build of the XA X Acceleration API @<:@default=disabled@:>@])], [enable_xa="$enableval"], [enable_xa=no]) AC_ARG_ENABLE([gbm], @@ -624,12 +681,17 @@ AC_ARG_ENABLE([gbm], [enable gbm library @<:@default=auto@:>@])], [enable_gbm="$enableval"], [enable_gbm=auto]) +AC_ARG_ENABLE([nine], + [AS_HELP_STRING([--enable-nine], + [enable build of the nine Direct3D9 API @<:@default=no@:>@])], + [enable_nine="$enableval"], + [enable_nine=no]) AC_ARG_ENABLE([xvmc], [AS_HELP_STRING([--enable-xvmc], [enable xvmc library @<:@default=auto@:>@])], [enable_xvmc="$enableval"], - [enable_xvmc=no]) + [enable_xvmc=auto]) AC_ARG_ENABLE([vdpau], [AS_HELP_STRING([--enable-vdpau], [enable vdpau library @<:@default=auto@:>@])], @@ -637,18 +699,23 @@ AC_ARG_ENABLE([vdpau], [enable_vdpau=auto]) AC_ARG_ENABLE([omx], [AS_HELP_STRING([--enable-omx], - [enable OpenMAX library @<:@default=no@:>@])], + [enable OpenMAX library @<:@default=disabled@:>@])], [enable_omx="$enableval"], [enable_omx=no]) +AC_ARG_ENABLE([va], + [AS_HELP_STRING([--enable-va], + [enable va library @<:@default=auto@:>@])], + [enable_va="$enableval"], + [enable_va=auto]) AC_ARG_ENABLE([opencl], [AS_HELP_STRING([--enable-opencl], - [enable OpenCL library @<:@default=no@:>@])], + [enable OpenCL library @<:@default=disabled@:>@])], [enable_opencl="$enableval"], [enable_opencl=no]) AC_ARG_ENABLE([opencl_icd], [AS_HELP_STRING([--enable-opencl-icd], [Build an OpenCL ICD library to be loaded by an ICD implementation - @<:@default=no@:>@])], + @<:@default=disabled@:>@])], [enable_opencl_icd="$enableval"], [enable_opencl_icd=no]) AC_ARG_ENABLE([xlib-glx], @@ -656,30 +723,16 @@ AC_ARG_ENABLE([xlib-glx], [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])], [enable_xlib_glx="$enableval"], [enable_xlib_glx=no]) -AC_ARG_ENABLE([gallium-egl], - [AS_HELP_STRING([--enable-gallium-egl], - [enable optional EGL state tracker (not required - for EGL support in Gallium with OpenGL and OpenGL ES) - @<:@default=disable@:>@])], - [enable_gallium_egl="$enableval"], - [enable_gallium_egl=no]) -AC_ARG_ENABLE([gallium-gbm], - [AS_HELP_STRING([--enable-gallium-gbm], - [enable optional gbm state tracker (not required for - gbm support in Gallium) - @<:@default=auto@:>@])], - [enable_gallium_gbm="$enableval"], - [enable_gallium_gbm=auto]) AC_ARG_ENABLE([r600-llvm-compiler], [AS_HELP_STRING([--enable-r600-llvm-compiler], - [Enable experimental LLVM backend for graphics shaders @<:@default=disable@:>@])], + [Enable experimental LLVM backend for graphics shaders @<:@default=disabled@:>@])], [enable_r600_llvm="$enableval"], [enable_r600_llvm=no]) AC_ARG_ENABLE([gallium-tests], [AS_HELP_STRING([--enable-gallium-tests], - [Enable optional Gallium tests) @<:@default=disable@:>@])], + [Enable optional Gallium tests) @<:@default=disabled@:>@])], [enable_gallium_tests="$enableval"], [enable_gallium_tests=no]) @@ -706,11 +759,13 @@ esac if test "x$enable_opengl" = xno -a \ "x$enable_gles1" = xno -a \ "x$enable_gles2" = xno -a \ + "x$enable_nine" = xno -a \ "x$enable_openvg" = xno -a \ "x$enable_xa" = xno -a \ "x$enable_xvmc" = xno -a \ "x$enable_vdpau" = xno -a \ "x$enable_omx" = xno -a \ + "x$enable_va" = xno -a \ "x$enable_opencl" = xno; then AC_MSG_ERROR([at least one API should be enabled]) fi @@ -775,13 +830,13 @@ esac AM_CONDITIONAL(HAVE_DRICOMMON, test "x$enable_dri" = xyes ) AM_CONDITIONAL(HAVE_DRISW, test "x$enable_dri" = xyes ) -AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes && test "x$dri_platform" = xdrm ) -AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes && test "x$dri_platform" = xdrm ) -AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes && test "x$dri_platform" = xapple ) +AM_CONDITIONAL(HAVE_DRI2, test "x$enable_dri" = xyes -a "x$dri_platform" = xdrm ) +AM_CONDITIONAL(HAVE_DRI3, test "x$enable_dri3" = xyes -a "x$dri_platform" = xdrm ) +AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xapple ) AC_ARG_ENABLE([shared-glapi], [AS_HELP_STRING([--enable-shared-glapi], - [Enable shared glapi for OpenGL @<:@default=yes@:>@])], + [Enable shared glapi for OpenGL @<:@default=enabled@:>@])], [enable_shared_glapi="$enableval"], [enable_shared_glapi=yes]) @@ -802,27 +857,23 @@ fi AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) +# Build the pipe-drivers as separate libraries/modules. +# Do not touch this unless you know what you are doing. +# XXX: Expose via configure option ? +enable_shared_pipe_drivers=no + dnl dnl Driver specific build directories dnl -GALLIUM_TARGET_DIRS="" -GALLIUM_WINSYS_DIRS="sw" -GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity" -GALLIUM_STATE_TRACKERS_DIRS="" case "x$enable_glx$enable_xlib_glx" in xyesyes) - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib" - GALLIUM_STATE_TRACKERS_DIRS="glx $GALLIUM_STATE_TRACKERS_DIRS" NEED_WINSYS_XLIB="yes" ;; esac if test "x$enable_dri" = xyes; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/dri" - GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS" - enable_gallium_loader=yes + enable_gallium_loader="$enable_shared_pipe_drivers" fi if test "x$enable_gallium_osmesa" = xyes; then @@ -832,8 +883,6 @@ if test "x$enable_gallium_osmesa" = xyes; then if test "x$enable_osmesa" = xyes; then AC_MSG_ERROR([Cannot enable both classic and Gallium OSMesa implementations]) fi - GALLIUM_STATE_TRACKERS_DIRS="osmesa $GALLIUM_STATE_TRACKERS_DIRS" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS osmesa" fi AC_SUBST([MESA_LLVM]) @@ -886,8 +935,9 @@ dnl case "x$enable_glx$enable_xlib_glx" in xyesyes) # Xlib-based GLX - PKG_CHECK_MODULES([XLIBGL], [x11 xext]) - GL_PC_REQ_PRIV="x11 xext" + dri_modules="x11 xext xcb" + PKG_CHECK_MODULES([XLIBGL], [$dri_modules]) + GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules" X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS" GL_LIB_DEPS="$XLIBGL_LIBS" GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS" @@ -898,7 +948,7 @@ xyesno) PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED]) # find the DRI deps for libGL - dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= $XCBGLX_REQUIRED" + dri_modules="x11 xext xdamage xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED" if test x"$driglx_direct" = xyes; then if test x"$dri_platform" = xdrm ; then @@ -919,6 +969,7 @@ xyesno) fi if test x"$enable_dri3" = xyes; then + PKG_CHECK_EXISTS([xcb >= $XCB_REQUIRED], [], AC_MSG_ERROR([DRI3 requires xcb >= $XCB_REQUIRED])) dri_modules="$dri_modules xcb-dri3 xcb-present xcb-sync xshmfence >= $XSHMFENCE_REQUIRED" fi fi @@ -1004,7 +1055,7 @@ AC_ARG_ENABLE([glx-tls], AC_SUBST(GLX_TLS, ${GLX_USE_TLS}) AS_IF([test "x$GLX_USE_TLS" = xyes -a "x$ax_pthread_ok" = xyes], - [DEFINES="${DEFINES} -DGLX_USE_TLS -DHAVE_PTHREAD"]) + [DEFINES="${DEFINES} -DGLX_USE_TLS"]) dnl dnl More DRI setup @@ -1067,7 +1118,6 @@ if test "x$enable_dri" = xyes; then esac ;; *freebsd* | dragonfly* | *netbsd* | openbsd*) - DEFINES="$DEFINES -DHAVE_PTHREAD" DEFINES="$DEFINES -DHAVE_ALIAS" ;; gnu*) @@ -1092,14 +1142,13 @@ if test "x$enable_dri" = xyes; then fi # Check for expat - PKG_CHECK_EXISTS([expat], [have_expat=yes], [have_expat=no]) - if test "x$have_expat" = "xyes"; then - PKG_CHECK_MODULES([EXPAT], [expat], [], - AC_MSG_ERROR([Expat required for DRI.])) - else - # expat version 2.0 and earlier do not provide expat.pc - EXPAT_LIBS=-lexpat - fi + PKG_CHECK_MODULES([EXPAT], [expat], [], + # expat version 2.0 and earlier do not provide expat.pc + [AC_CHECK_HEADER([expat.h],[], + [AC_MSG_ERROR([Expat headers required for DRI not found])]) + AC_CHECK_LIB([expat],[XML_ParserCreate],[], + [AC_MSG_ERROR([Expat library required for DRI not found])]) + EXPAT_LIBS="-lexpat"]) DRICOMMON_NEED_LIBDRM=no # If we are building any DRI driver other than swrast. @@ -1210,12 +1259,10 @@ if test "x$enable_osmesa" = xyes -o "x$enable_gallium_osmesa" = xyes; then else OSMESA_LIB_DEPS="" fi - OSMESA_MESA_DEPS="" OSMESA_PC_LIB_PRIV="-lm $PTHREAD_LIBS $SELINUX_LIBS $DLOPEN_LIBS" fi AC_SUBST([OSMESA_LIB_DEPS]) -AC_SUBST([OSMESA_MESA_DEPS]) AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) @@ -1279,55 +1326,6 @@ fi AM_CONDITIONAL(HAVE_EGL, test "x$enable_egl" = xyes) AC_SUBST([EGL_LIB_DEPS]) -dnl -dnl EGL Gallium configuration -dnl -if test "x$enable_gallium_egl" = xyes; then - if test -z "$with_gallium_drivers"; then - AC_MSG_ERROR([cannot enable egl_gallium without Gallium]) - fi - if test "x$enable_egl" = xno; then - AC_MSG_ERROR([cannot enable egl_gallium without EGL]) - fi - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([egl_gallium requires libdrm >= $LIBDRM_REQUIRED]) - fi - - GALLIUM_STATE_TRACKERS_DIRS="egl $GALLIUM_STATE_TRACKERS_DIRS" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl-static" -# enable_gallium_loader=yes -fi -AM_CONDITIONAL(HAVE_GALLIUM_EGL, test "x$enable_gallium_egl" = xyes) - -dnl -dnl gbm Gallium configuration -dnl -if test "x$enable_gallium_gbm" = xauto; then - case "$enable_gbm$enable_gallium_egl$enable_dri$with_egl_platforms" in - yesyesyes*drm*) - enable_gallium_gbm=yes ;; - *) - enable_gallium_gbm=no ;; - esac -fi -if test "x$enable_gallium_gbm" = xyes; then - if test -z "$with_gallium_drivers"; then - AC_MSG_ERROR([cannot enable gbm_gallium without Gallium]) - fi - if test "x$enable_gbm" = xno; then - AC_MSG_ERROR([cannot enable gbm_gallium without gbm]) - fi - - if test "x$enable_gallium_egl" != xyes; then - AC_MSG_ERROR([gbm_gallium is only used by egl_gallium]) - fi - - GALLIUM_STATE_TRACKERS_DIRS="gbm $GALLIUM_STATE_TRACKERS_DIRS" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS gbm" - enable_gallium_loader=yes -fi -AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes) - dnl dnl XA configuration dnl @@ -1340,8 +1338,7 @@ if test "x$enable_xa" = xyes; then enabling XA. Example: ./configure --enable-xa --with-gallium-drivers=svga...]) fi - GALLIUM_STATE_TRACKERS_DIRS="xa $GALLIUM_STATE_TRACKERS_DIRS" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes) @@ -1357,13 +1354,12 @@ if test "x$enable_openvg" = xyes; then if test -z "$with_gallium_drivers"; then AC_MSG_ERROR([cannot enable OpenVG without Gallium]) fi - if test "x$enable_gallium_egl" = xno; then - AC_MSG_ERROR([cannot enable OpenVG without egl_gallium]) - fi + + AC_MSG_ERROR([Cannot enable OpenVG, because egl_gallium has been removed and + OpenVG has not been integrated into standard libEGL yet]) EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS $PTHREAD_LIBS" - GALLIUM_STATE_TRACKERS_DIRS="vega $GALLIUM_STATE_TRACKERS_DIRS" VG_PC_LIB_PRIV="-lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS" AC_SUBST([VG_PC_LIB_PRIV]) fi @@ -1374,40 +1370,73 @@ dnl Gallium G3DVL configuration dnl if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then if test "x$enable_xvmc" = xauto; then - PKG_CHECK_EXISTS([xvmc], [enable_xvmc=yes], [enable_xvmc=no]) + PKG_CHECK_EXISTS([xvmc >= $XVMC_REQUIRED], [enable_xvmc=yes], [enable_xvmc=no]) fi if test "x$enable_vdpau" = xauto; then - PKG_CHECK_EXISTS([vdpau], [enable_vdpau=yes], [enable_vdpau=no]) + PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no]) fi if test "x$enable_omx" = xauto; then - PKG_CHECK_EXISTS([libomxil-bellagio], [enable_omx=yes], [enable_omx=no]) + PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=no]) + fi + + if test "x$enable_va" = xauto; then + PKG_CHECK_EXISTS([libva >= $LIBVA_REQUIRED], [enable_va=yes], [enable_va=no]) fi fi +if test "x$enable_xvmc" = xyes -o \ + "x$enable_vdpau" = xyes -o \ + "x$enable_omx" = xyes -o \ + "x$enable_va" = xyes; then + PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + need_gallium_vl=yes +fi +AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes) + if test "x$enable_xvmc" = xyes; then - PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" - enable_gallium_loader=yes + PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED]) + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes) if test "x$enable_vdpau" = xyes; then - PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED], - [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau" - enable_gallium_loader=yes + PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED]) + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) if test "x$enable_omx" = xyes; then - PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx" - enable_gallium_loader=yes + PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED]) + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) +if test "x$enable_va" = xyes; then + PKG_CHECK_MODULES([VA], [libva >= $LIBVA_REQUIRED]) + enable_gallium_loader=$enable_shared_pipe_drivers +fi +AM_CONDITIONAL(HAVE_ST_VA, test "x$enable_va" = xyes) + +dnl +dnl Nine Direct3D9 configuration +dnl +if test "x$enable_nine" = xyes; then + if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then + AC_MSG_ERROR([nine requires the gallium swrast driver]) + fi + if test "x$with_gallium_drivers" == xswrast; then + AC_MSG_ERROR([nine requires at least one non-swrast gallium driver]) + fi + if test "x$enable_dri3" = xno; then + AC_MSG_WARN([using nine together with wine requires DRI3 enabled system]) + fi + + enable_gallium_loader=$enable_shared_pipe_drivers +fi +AM_CONDITIONAL(HAVE_ST_NINE, test "x$enable_nine" = xyes) + dnl dnl OpenCL configuration dnl @@ -1432,6 +1461,7 @@ AC_ARG_WITH([clang-libdir], [CLANG_LIBDIR='']) PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no]) +AC_CHECK_LIB([elf], [elf_memory], [have_libelf=yes;ELF_LIB=-lelf]) if test "x$enable_opencl" = xyes; then if test -z "$with_gallium_drivers"; then @@ -1454,8 +1484,7 @@ if test "x$enable_opencl" = xyes; then AC_SUBST([LIBCLC_LIBEXECDIR]) fi - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS clover" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS opencl" + # XXX: Use $enable_shared_pipe_drivers once converted to use static/shared pipe-drivers enable_gallium_loader=yes if test "x$enable_opencl_icd" = xyes; then @@ -1463,6 +1492,10 @@ if test "x$enable_opencl" = xyes; then else OPENCL_LIBNAME="OpenCL" fi + + if test "x$have_libelf" != xyes; then + AC_MSG_ERROR([Clover requires libelf]) + fi fi AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes) AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes) @@ -1517,7 +1550,6 @@ for plat in $egl_platforms; do case "$plat" in wayland) PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED]) - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland" WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, @@ -1525,7 +1557,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes]) + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED xcb-xfixes]) ;; drm) @@ -1559,7 +1591,6 @@ else fi if echo "$egl_platforms" | grep -q 'x11'; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" NEED_WINSYS_XLIB=yes fi AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11') @@ -1580,13 +1611,6 @@ if ! echo "$egl_platforms" | grep -q 'x11'; then GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" fi -AC_ARG_WITH([egl-driver-dir], - [AS_HELP_STRING([--with-egl-driver-dir=DIR], - [directory for EGL drivers @<:@default=${libdir}/egl@:>@])], - [EGL_DRIVER_INSTALL_DIR="$withval"], - [EGL_DRIVER_INSTALL_DIR='${libdir}/egl']) -AC_SUBST([EGL_DRIVER_INSTALL_DIR]) - AC_ARG_WITH([max-width], [AS_HELP_STRING([--with-max-width=N], [Maximum framebuffer width (4096)])], @@ -1630,6 +1654,7 @@ strip_unwanted_llvm_flags() { # Use \> (marks the end of the word) echo `$1` | sed \ -e 's/-DNDEBUG\>//g' \ + -e 's/-D_GNU_SOURCE\>//g' \ -e 's/-pedantic\>//g' \ -e 's/-Wcovered-switch-default\>//g' \ -e 's/-O.\>//g' \ @@ -1664,7 +1689,7 @@ if test "x$enable_gallium_llvm" = xyes; then fi if test "x$LLVM_CONFIG" != xno; then - LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'` + LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` @@ -1678,11 +1703,10 @@ if test "x$enable_gallium_llvm" = xyes; then AC_COMPUTE_INT([LLVM_VERSION_MINOR], [LLVM_VERSION_MINOR], [#include "${LLVM_INCLUDEDIR}/llvm/Config/llvm-config.h"]) - dnl In LLVM 3.4.1 patch level was defined in config.h and not - dnl llvm-config.h - AC_COMPUTE_INT([LLVM_VERSION_PATCH], [LLVM_VERSION_PATCH], - [#include "${LLVM_INCLUDEDIR}/llvm/Config/config.h"], - LLVM_VERSION_PATCH=0) dnl Default if LLVM_VERSION_PATCH not found + LLVM_VERSION_PATCH=`echo $LLVM_VERSION | cut -d. -f3 | egrep -o '^[[0-9]]+'` + if test -z "$LLVM_VERSION_PATCH"; then + LLVM_VERSION_PATCH=0 + fi if test -n "${LLVM_VERSION_MAJOR}"; then LLVM_VERSION_INT="${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" @@ -1691,7 +1715,7 @@ if test "x$enable_gallium_llvm" = xyes; then fi LLVM_REQUIRED_VERSION_MAJOR="3" - LLVM_REQUIRED_VERSION_MINOR="1" + LLVM_REQUIRED_VERSION_MINOR="3" if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required]) fi @@ -1756,15 +1780,11 @@ dnl dnl Gallium Tests dnl if test "x$enable_gallium_tests" = xyes; then + # XXX: Use $enable_shared_pipe_drivers once converted to use static/shared pipe-drivers enable_gallium_loader=yes fi AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) -if test "x$enable_gallium_loader" = xyes; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader" -fi -AM_CONDITIONAL(NEED_GALLIUM_LOADER, test "x$enable_gallium_loader" = xyes) - dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], @@ -1773,50 +1793,37 @@ AC_ARG_WITH([vdpau-libdir], [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) -OMX_LIB_INSTALL_DIR_DEFAULT='' -if test "x$enable_omx" = xyes; then - OMX_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio` -fi +dnl Directory for OMX libs AC_ARG_WITH([omx-libdir], [AS_HELP_STRING([--with-omx-libdir=DIR], [directory for the OMX libraries])], [OMX_LIB_INSTALL_DIR="$withval"], - [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"]) + [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`]) AC_SUBST([OMX_LIB_INSTALL_DIR]) -dnl Directory for OpenCL libs -AC_ARG_WITH([opencl-libdir], - [AS_HELP_STRING([--with-opencl-libdir=DIR], - [directory for auxiliary libraries used by the OpenCL implementation @<:@default=${libdir}/opencl@:>@])], - [OPENCL_LIB_INSTALL_DIR="$withval"], - [OPENCL_LIB_INSTALL_DIR='${libdir}/opencl']) -AC_SUBST([OPENCL_LIB_INSTALL_DIR]) +dnl Directory for VA libs + +AC_ARG_WITH([va-libdir], + [AS_HELP_STRING([--with-va-libdir=DIR], + [directory for the VA libraries @<:@${libdir}/dri@:>@])], + [VA_LIB_INSTALL_DIR="$withval"], + [VA_LIB_INSTALL_DIR="${libdir}/dri"]) +AC_SUBST([VA_LIB_INSTALL_DIR]) + +AC_ARG_WITH([d3d-libdir], + [AS_HELP_STRING([--with-d3d-libdir=DIR], + [directory for the D3D modules @<:@${libdir}/d3d@:>@])], + [D3D_DRIVER_INSTALL_DIR="$withval"], + [D3D_DRIVER_INSTALL_DIR="${libdir}/d3d"]) +AC_SUBST([D3D_DRIVER_INSTALL_DIR]) dnl dnl Gallium helper functions dnl -gallium_check_st() { - if test "x$NEED_NONNULL_WINSYS" = xyes; then - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED]) - fi - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" - fi - if test "x$enable_dri" = xyes && test -n "$2"; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2" - fi - if test "x$enable_xa" = xyes && test -n "$3"; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" - fi - if test "x$enable_xvmc" = xyes && test -n "$4"; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" - fi - if test "x$enable_vdpau" = xyes && test -n "$5"; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" - fi - if test "x$enable_omx" = xyes && test "x$6" != x; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" +gallium_require_drm() { + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([$1 requires libdrm >= $LIBDRM_REQUIRED]) fi } @@ -1834,11 +1841,11 @@ gallium_require_drm_loader() { if test "x$need_pci_id$have_pci_id" = xyesno; then AC_MSG_ERROR([Gallium drm loader requires libudev >= $LIBUDEV_REQUIRED or sysfs]) fi - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([Gallium drm loader requires libdrm >= $LIBDRM_REQUIRED]) - fi enable_gallium_drm_loader=yes fi + if test "x$enable_va" = xyes && test "x$7" != x; then + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" + fi } require_egl_drm() { @@ -1871,17 +1878,11 @@ radeon_llvm_check() { fi LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo" NEED_RADEON_LLVM=yes - AC_CHECK_LIB([elf], [elf_memory], [ELF_LIB=-lelf], - [AC_MSG_ERROR([$1 requires libelf when using LLVM])]) + if test "x$have_libelf" != xyes; then + AC_MSG_ERROR([$1 requires libelf when using llvm]) + fi } -dnl Gallium drivers -if test "x$enable_dri" = xyes -o "x$enable_xa" = xyes -o \ - "x$enable_xvmc" = xyes -o "x$enable_vdpau" = xyes; then - NEED_NONNULL_WINSYS=yes -fi -AM_CONDITIONAL(NEED_NONNULL_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes) - dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block if test -n "$with_gallium_drivers"; then gallium_drivers=`IFS=', '; echo $with_gallium_drivers` @@ -1889,37 +1890,33 @@ if test -n "$with_gallium_drivers"; then case "x$driver" in xsvga) HAVE_GALLIUM_SVGA=yes - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga softpipe" + gallium_require_drm "svga" gallium_require_drm_loader - gallium_check_st "svga/drm" "dri/vmwgfx" "xa/vmwgfx" ;; xi915) HAVE_GALLIUM_I915=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) + gallium_require_drm "Gallium i915" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915" - gallium_check_st "i915/drm" "dri/i915" "xa/i915" ;; xilo) HAVE_GALLIUM_ILO=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) + gallium_require_drm "Gallium i965/ilo" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS ilo" - gallium_check_st "intel/drm" "dri/ilo" "xa/ilo" ;; xr300) HAVE_GALLIUM_R300=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) + gallium_require_drm "Gallium R300" gallium_require_drm_loader gallium_require_llvm "Gallium R300" - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "dri/r300" ;; xr600) HAVE_GALLIUM_R600=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) + gallium_require_drm "Gallium R600" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then radeon_llvm_check "r600g" LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" @@ -1930,52 +1927,37 @@ if test -n "$with_gallium_drivers"; then if test "x$enable_opencl" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" fi - gallium_check_st "radeon/drm" "dri/r600" "" "xvmc/r600" "vdpau/r600" "omx/r600" ;; xradeonsi) HAVE_GALLIUM_RADEONSI=yes PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) + gallium_require_drm "radeonsi" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" radeon_llvm_check "radeonsi" require_egl_drm "radeonsi" - gallium_check_st "radeon/drm" "dri/radeonsi" "" "" "vdpau/radeonsi" "omx/radeonsi" ;; xnouveau) HAVE_GALLIUM_NOUVEAU=yes PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) + gallium_require_drm "nouveau" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau" - gallium_check_st "nouveau/drm" "dri/nouveau" "xa/nouveau" "xvmc/nouveau" "vdpau/nouveau" "omx/nouveau" ;; xfreedreno) HAVE_GALLIUM_FREEDRENO=yes PKG_CHECK_MODULES([FREEDRENO], [libdrm_freedreno >= $LIBDRM_FREEDRENO_REQUIRED]) + gallium_require_drm "freedreno" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS freedreno" - gallium_check_st "freedreno/drm" "dri/freedreno" "xa/freedreno" "" "" ;; xswrast) HAVE_GALLIUM_SOFTPIPE=yes - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS softpipe" if test "x$MESA_LLVM" = x1; then HAVE_GALLIUM_LLVMPIPE=yes - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" - fi - - if test "x$enable_dri" = xyes; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri/swrast" - fi - - if test "x$have_libdrm" = xyes; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri/kms-swrast" fi ;; xvc4) HAVE_GALLIUM_VC4=yes + gallium_require_drm "vc4" gallium_require_drm_loader - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS vc4" - gallium_check_st "vc4/drm" "dri-vc4" "" "" "" case "$host_cpu" in i?86 | x86_64 | amd64) @@ -1991,7 +1973,7 @@ if test -n "$with_gallium_drivers"; then fi dnl Set LLVM_LIBS - This is done after the driver configuration so -dnl that drivers can add additonal components to LLVM_COMPONENTS. +dnl that drivers can add additional components to LLVM_COMPONENTS. dnl Previously, gallium drivers were updating LLVM_LIBS directly dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but dnl this was causing the same libraries to be appear multiple times @@ -2024,11 +2006,16 @@ if test "x$MESA_LLVM" != x0; then invocation and rebuild.])]) dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each compoenent and we have + dnl install uses a shared object for each component and we have dnl already added all of these objects to LLVM_LIBS. fi else - AC_MSG_WARN([Building mesa with staticly linked LLVM may cause compilation issues]) + AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues]) + dnl We need to link to llvm system libs when using static libs + dnl However, only llvm 3.5+ provides --system-libs + if test $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then + LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`" + fi fi fi @@ -2046,14 +2033,7 @@ AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes) AM_CONDITIONAL(HAVE_GALLIUM_VC4, test "x$HAVE_GALLIUM_VC4" = xyes) -AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes -o \ - "x$HAVE_GALLIUM_SOFTPIPE" = xyes) -AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes \ - && test "x$MESA_LLVM" = x1) - -# Enable static gallium targets for now. -# Do not touch this unless you know what you are doing. -AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "xyes" = xyes) +AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers" = xno) # NOTE: anything using xcb or other client side libs ends up in separate # _CLIENT variables. The pipe loader is built in two variants, @@ -2061,8 +2041,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "xyes" = xyes) # use by XA tracker in particular, but could be used in any case # where communication with xserver is not desired). if test "x$enable_gallium_loader" = xyes; then - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/null" - if test "x$NEED_WINSYS_XLIB" = xyes; then GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" fi @@ -2097,12 +2075,9 @@ AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes) AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes) AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) -AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes -a \ - "x$HAVE_GALLIUM_R300" = xyes -o \ +AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ "x$HAVE_GALLIUM_R600" = xyes -o \ "x$HAVE_GALLIUM_RADEONSI" = xyes) -AM_CONDITIONAL(NEED_WINSYS_WRAPPER, test "x$HAVE_GALLIUM_I915" = xyes -o \ - "x$HAVE_GALLIUM_SVGA" = xyes) AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$NEED_WINSYS_XLIB" = xyes) AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes) AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes) @@ -2127,9 +2102,19 @@ AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64) AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64) AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc) +AC_SUBST([NINE_MAJOR], 1) +AC_SUBST([NINE_MINOR], 0) +AC_SUBST([NINE_TINY], 0) +AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_TINY") + AC_SUBST([VDPAU_MAJOR], 1) AC_SUBST([VDPAU_MINOR], 0) +VA_MAJOR=`$PKG_CONFIG --modversion libva | $SED -n 's/\([[^\.]]*\)\..*$/\1/p'` +VA_MINOR=`$PKG_CONFIG --modversion libva | $SED -n 's/.*\.\(.*\)\..*$/\1/p'` +AC_SUBST([VA_MAJOR], $VA_MAJOR) +AC_SUBST([VA_MINOR], $VA_MINOR) + AC_SUBST([XVMC_MAJOR], 1) AC_SUBST([XVMC_MINOR], 0) @@ -2163,7 +2148,6 @@ AC_CONFIG_FILES([Makefile src/egl/drivers/dri2/Makefile src/egl/main/Makefile src/egl/main/egl.pc - src/egl/wayland/Makefile src/egl/wayland/wayland-drm/Makefile src/egl/wayland/wayland-egl/Makefile src/egl/wayland/wayland-egl/wayland-egl.pc @@ -2187,26 +2171,28 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/svga/Makefile src/gallium/drivers/trace/Makefile src/gallium/drivers/vc4/Makefile + src/gallium/drivers/vc4/kernel/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/state_trackers/dri/Makefile - src/gallium/state_trackers/egl/Makefile - src/gallium/state_trackers/gbm/Makefile src/gallium/state_trackers/glx/xlib/Makefile + src/gallium/state_trackers/nine/Makefile src/gallium/state_trackers/omx/Makefile src/gallium/state_trackers/osmesa/Makefile + src/gallium/state_trackers/va/Makefile src/gallium/state_trackers/vdpau/Makefile src/gallium/state_trackers/vega/Makefile src/gallium/state_trackers/xa/Makefile src/gallium/state_trackers/xvmc/Makefile + src/gallium/targets/d3dadapter9/Makefile + src/gallium/targets/d3dadapter9/d3d.pc src/gallium/targets/dri/Makefile - src/gallium/targets/egl-static/Makefile - src/gallium/targets/gbm/Makefile src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/omx/Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/osmesa/Makefile src/gallium/targets/osmesa/osmesa.pc src/gallium/targets/pipe-loader/Makefile + src/gallium/targets/va/Makefile src/gallium/targets/vdpau/Makefile src/gallium/targets/xa/Makefile src/gallium/targets/xa/xatracker.pc @@ -2238,10 +2224,7 @@ AC_CONFIG_FILES([Makefile src/mapi/Makefile src/mapi/es1api/glesv1_cm.pc src/mapi/es2api/glesv2.pc - src/mapi/glapi/Makefile src/mapi/glapi/gen/Makefile - src/mapi/glapi/tests/Makefile - src/mapi/shared-glapi/tests/Makefile src/mapi/vgapi/Makefile src/mapi/vgapi/vg.pc src/mesa/Makefile @@ -2263,12 +2246,6 @@ AC_CONFIG_FILES([Makefile src/util/Makefile src/util/tests/hash_table/Makefile]) -dnl Sort the dirs alphabetically -GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` -GALLIUM_WINSYS_DIRS=`echo $GALLIUM_WINSYS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` -GALLIUM_DRIVERS_DIRS=`echo $GALLIUM_DRIVERS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` -GALLIUM_STATE_TRACKERS_DIRS=`echo $GALLIUM_STATE_TRACKERS_DIRS|tr " " "\n"|sort -u|tr "\n" " "` - AC_OUTPUT dnl @@ -2333,12 +2310,7 @@ if test "$enable_egl" = yes; then egl_drivers="$egl_drivers builtin:egl_dri2" fi - if test "x$enable_gallium_egl" = xyes; then - echo " EGL drivers: ${egl_drivers} egl_gallium" - echo " EGL Gallium STs:$EGL_CLIENT_APIS" - else - echo " EGL drivers: $egl_drivers" - fi + echo " EGL drivers: $egl_drivers" fi echo "" @@ -2353,10 +2325,6 @@ fi echo "" if test -n "$with_gallium_drivers"; then echo " Gallium: yes" - echo " Target dirs: $GALLIUM_TARGET_DIRS" - echo " Winsys dirs: $GALLIUM_WINSYS_DIRS" - echo " Driver dirs: $GALLIUM_DRIVERS_DIRS" - echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS" else echo " Gallium: no" fi