diff options
| author | Younes Manton <[email protected]> | 2010-05-29 19:22:14 -0400 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-05-29 19:22:14 -0400 |
| commit | ea3a01ae4d2117b733c0d415ce5bc69015984d30 (patch) | |
| tree | 2efd904dac4787a3c38136b2bef961ad50a4008a /configure.ac | |
| parent | 62074f44bb5944593b65d6203deae6300bead42d (diff) | |
vl: Get nouveau building again.
Still some DRI2 bits to sort out.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 7062817ea1c..757bc1e8e78 100644 --- a/configure.ac +++ b/configure.ac @@ -1255,6 +1255,13 @@ yes) # mesa/es is required to build es state tracker CORE_DIRS="$CORE_DIRS mesa/es" ;; + xorg/xvmc) + # Check for libXvMC? + if test "x$enable_gallium_g3dvl" != xyes; then + AC_MSG_ERROR([cannot build XvMC state tracker without --enable-gallium-g3dvl]) + fi + HAVE_ST_XVMC="yes" + ;; esac done GALLIUM_STATE_TRACKERS_DIRS="$state_trackers" @@ -1358,7 +1365,7 @@ dnl dnl Gallium helper functions dnl gallium_check_st() { - if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_EGL" = xyes || test "x$HAVE_ST_XORG" = xyes; then + if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_EGL" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XVMC" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" fi if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then @@ -1370,6 +1377,9 @@ gallium_check_st() { if test "x$HAVE_ST_XORG" = xyes && test "x$4" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" fi + if test "x$HAVE_ST_XVMC" = xyes && test "x$5" != x; then + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" + fi } @@ -1430,7 +1440,7 @@ AC_ARG_ENABLE([gallium-nouveau], [enable_gallium_nouveau=no]) if test "x$enable_gallium_nouveau" = xyes; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50" - gallium_check_st "nouveau/drm" "dri-nouveau" "egl-nouveau" "xorg-nouveau" + gallium_check_st "nouveau/drm" "dri-nouveau" "egl-nouveau" "xorg-nouveau" "xvmc-nouveau" fi dnl @@ -1442,7 +1452,14 @@ AC_ARG_ENABLE([gallium-g3dvl], [enable_gallium_g3dvl="$enableval"], [enable_gallium_g3dvl=no]) if test "x$enable_gallium_g3dvl" = xyes; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe" + case "$mesa_driver" in + xlib) + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe" + ;; + dri) + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS g3dvl/dri" + ;; + esac fi dnl |