diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-07 08:37:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-07 08:37:48 +0200 |
| commit | dbe01a4f78f09723b327d1d8522bfa5026c4f6e0 (patch) | |
| tree | 8b770c826cf9f64cb61ff3efd1c2f01aeb2dc8c9 /mesalib/configure.ac | |
| parent | d5eff0b8affe3bfa3d42f54f82d03ba3c0f3e826 (diff) | |
| parent | 47a6ae678489d7082b5d7da35d1a92b4233fb5eb (diff) | |
| download | vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.gz vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.tar.bz2 vcxsrv-dbe01a4f78f09723b327d1d8522bfa5026c4f6e0.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/ir_print_visitor.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/opt_constant_propagation.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 7d0f3d8ba..f19f6478b 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -570,6 +570,11 @@ AC_ARG_ENABLE([xorg], [enable support for X.Org DDX API @<:@default=no@:>@])], [enable_xorg="$enableval"], [enable_xorg=no]) +AC_ARG_ENABLE([xa], + [AS_HELP_STRING([--enable-xa], + [enable build of the XA X Acceleration API @<:@default=no@:>@])], + [enable_xa="$enableval"], + [enable_xa=no]) AC_ARG_ENABLE([d3d1x], [AS_HELP_STRING([--enable-d3d1x], [enable support for Direct3D 10 & 11 low-level API @<:@default=no@:>@])], @@ -617,6 +622,7 @@ if test "x$enable_opengl" = xno -a \ "x$enable_gles2" = xno -a \ "x$enable_openvg" = xno -a \ "x$enable_xorg" = xno -a \ + "x$enable_xa" = xno -a \ "x$enable_d3d1x" = xno; then AC_MSG_ERROR([at least one API should be enabled]) fi @@ -1422,6 +1428,14 @@ if test "x$enable_xorg" = xyes; then fi dnl +dnl XA configuration +dnl +if test "x$enable_xa" = xyes; then + GALLIUM_STATE_TRACKERS_DIRS="xa $GALLIUM_STATE_TRACKERS_DIRS" + HAVE_ST_XA=yes +fi + +dnl dnl OpenVG configuration dnl VG_LIB_DEPS="" @@ -1810,7 +1824,8 @@ dnl dnl Gallium helper functions dnl gallium_check_st() { - if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then + if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes || + test "x$HAVE_ST_XA" = xyes; then if test "x$have_libdrm" != xyes; then AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED]) fi @@ -1822,6 +1837,9 @@ gallium_check_st() { if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" fi + if test "x$HAVE_ST_XA" = xyes && test "x$4" != x; then + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" + fi } gallium_require_llvm() { @@ -1842,7 +1860,7 @@ if test "x$with_gallium_drivers" != x; then for driver in $gallium_drivers; do case "x$driver" in xsvga) - gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx" + gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx" "xa-vmwgfx" ;; xi915) gallium_check_st "i915/drm" "dri-i915" "xorg-i915" |