diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-05 08:05:28 +0100 |
| commit | fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch) | |
| tree | c59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /mesalib/configure.ac | |
| parent | 5d6e342b3c2d0d3607b184b1472b816228839e3f (diff) | |
| parent | 528f5bd58a139174170c4130c67dca30193c9057 (diff) | |
| download | vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2 vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 39d4e0f55..a4943e126 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -799,7 +799,7 @@ GLU_DIRS="sgi" GALLIUM_DIRS="auxiliary drivers state_trackers" GALLIUM_TARGET_DIRS="" GALLIUM_WINSYS_DIRS="sw" -GALLIUM_DRIVERS_DIRS="failover galahad trace rbug noop identity" +GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity" GALLIUM_STATE_TRACKERS_DIRS="" # build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled @@ -1844,14 +1844,6 @@ if test "x$with_gallium_drivers" != x; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw" gallium_check_st "i915/drm" "dri-i915" "xorg-i915" ;; - xi965) - PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965 softpipe" - if test "x$MESA_LLVM" = x1; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" - fi - gallium_check_st "i965/drm" "dri-i965" "xorg-i965" - ;; xr300) gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" @@ -2019,12 +2011,6 @@ if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then echo " Winsys dirs: $GALLIUM_WINSYS_DIRS" echo " Driver dirs: $GALLIUM_DRIVERS_DIRS" echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS" - if echo "$GALLIUM_DRIVERS_DIRS" | grep i965 > /dev/null 2>&1; then - echo - echo " WARNING: enabling i965 gallium driver" - echo " the i965g driver is currently utterly broken, only for adventurous developers" - echo - fi else echo " Gallium: no" fi |