Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-24 Thread Brian Paul
On Mon, Jan 23, 2012 at 12:48 PM, Matt Turner matts...@gmail.com wrote:
 On Mon, Jan 23, 2012 at 9:28 AM, Jakob Bornecrantz ja...@vmware.com wrote:
 - Original Message -
 If you're building mesa, you know what drivers you want.

 NACK, the default should be build as much as possible.

 We don't build OpenVG, OSMesa, i915g, GLESv1, GLESv2, and a number of
 Gallium state trackers by default.

 And while having reasonable defaults for components like EGL and GLES
 makes sense, having default drivers doesn't. I think we can roughly
 split people who build mesa into two groups:
 - developers  users
 - distro packagers

 Developers and users are going to be building for a particular system
 with a single graphics card, so almost always they're going to have to
 disable either DRI or Gallium drivers. The current default doesn't
 work for them.

As a developer (working in core Mesa a lot), I like to build all the
drivers all the time so that I don't accidentally break something
somewhere.  I don't think I'm the only one who should be doing that.
What configure options would you suggest in that case?


 Distro packagers are either going to build everything they can, or
 offer knobs for users to select what they want to build. In the case
 of the former, they're not going to depend on our configure script to
 tell them what to build, because we already know it doesn't build
 everything.

 Neither group is served well by selecting a bunch of drivers when none
 are requested.

 I hope my reasoning is clear now.

 The proper fix here is to merge --with-dri-drivers and
 --with-gallium-drivers, and have it figure with gallium/dri
 drivers to turn based on that list, so:

 --with-awesome-new-option=dri-vmwgfx,dri-i965

Merging those options sounds good to me too.


-Brian
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-24 Thread Matt Turner
On Tue, Jan 24, 2012 at 10:12 AM, Brian Paul brian.e.p...@gmail.com wrote:
 On Mon, Jan 23, 2012 at 12:48 PM, Matt Turner matts...@gmail.com wrote:
 On Mon, Jan 23, 2012 at 9:28 AM, Jakob Bornecrantz ja...@vmware.com wrote:
 - Original Message -
 If you're building mesa, you know what drivers you want.

 NACK, the default should be build as much as possible.

 We don't build OpenVG, OSMesa, i915g, GLESv1, GLESv2, and a number of
 Gallium state trackers by default.

 And while having reasonable defaults for components like EGL and GLES
 makes sense, having default drivers doesn't. I think we can roughly
 split people who build mesa into two groups:
 - developers  users
 - distro packagers

 Developers and users are going to be building for a particular system
 with a single graphics card, so almost always they're going to have to
 disable either DRI or Gallium drivers. The current default doesn't
 work for them.

 As a developer (working in core Mesa a lot), I like to build all the
 drivers all the time so that I don't accidentally break something
 somewhere.  I don't think I'm the only one who should be doing that.
 What configure options would you suggest in that case?

--with-dri-drivers=i915,i965,radeon,r200,nouveau,swrast
--with-gallium-drivers=r300,r600,i915,svga,swrast

or it'd be easy to change configure to support --with-dri-drivers=all
--with-gallium-drivers=all

 Distro packagers are either going to build everything they can, or
 offer knobs for users to select what they want to build. In the case
 of the former, they're not going to depend on our configure script to
 tell them what to build, because we already know it doesn't build
 everything.

 Neither group is served well by selecting a bunch of drivers when none
 are requested.

 I hope my reasoning is clear now.

 The proper fix here is to merge --with-dri-drivers and
 --with-gallium-drivers, and have it figure with gallium/dri
 drivers to turn based on that list, so:

 --with-awesome-new-option=dri-vmwgfx,dri-i965

 Merging those options sounds good to me too.

The more I've thought about it, the more I like this. I'll see what I can do.

Matt
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-24 Thread Ian Romanick

On 01/24/2012 08:10 AM, Matt Turner wrote:

On Tue, Jan 24, 2012 at 10:12 AM, Brian Paulbrian.e.p...@gmail.com  wrote:

On Mon, Jan 23, 2012 at 12:48 PM, Matt Turnermatts...@gmail.com  wrote:

On Mon, Jan 23, 2012 at 9:28 AM, Jakob Bornecrantzja...@vmware.com  wrote:

- Original Message -

If you're building mesa, you know what drivers you want.


NACK, the default should be build as much as possible.


We don't build OpenVG, OSMesa, i915g, GLESv1, GLESv2, and a number of
Gallium state trackers by default.

And while having reasonable defaults for components like EGL and GLES
makes sense, having default drivers doesn't. I think we can roughly
split people who build mesa into two groups:
- developers  users
- distro packagers

Developers and users are going to be building for a particular system
with a single graphics card, so almost always they're going to have to
disable either DRI or Gallium drivers. The current default doesn't
work for them.


As a developer (working in core Mesa a lot), I like to build all the
drivers all the time so that I don't accidentally break something
somewhere.  I don't think I'm the only one who should be doing that.
What configure options would you suggest in that case?


--with-dri-drivers=i915,i965,radeon,r200,nouveau,swrast
--with-gallium-drivers=r300,r600,i915,svga,swrast

or it'd be easy to change configure to support --with-dri-drivers=all
--with-gallium-drivers=all


Right now this works with either --with-dri-drivers or 
--with-dri-drivers=yes.  Changing that to --with-dri-drivers=all 
wouldn't be so bad.



Distro packagers are either going to build everything they can, or
offer knobs for users to select what they want to build. In the case
of the former, they're not going to depend on our configure script to
tell them what to build, because we already know it doesn't build
everything.

Neither group is served well by selecting a bunch of drivers when none
are requested.

I hope my reasoning is clear now.


The proper fix here is to merge --with-dri-drivers and
--with-gallium-drivers, and have it figure with gallium/dri
drivers to turn based on that list, so:

--with-awesome-new-option=dri-vmwgfx,dri-i965


Merging those options sounds good to me too.


The more I've thought about it, the more I like this. I'll see what I can do.

Matt
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-24 Thread Kenneth Graunke

On 01/24/2012 08:10 AM, Matt Turner wrote:

On Tue, Jan 24, 2012 at 10:12 AM, Brian Paulbrian.e.p...@gmail.com  wrote:

On Mon, Jan 23, 2012 at 12:48 PM, Matt Turnermatts...@gmail.com  wrote:

On Mon, Jan 23, 2012 at 9:28 AM, Jakob Bornecrantzja...@vmware.com  wrote:

- Original Message -

If you're building mesa, you know what drivers you want.


NACK, the default should be build as much as possible.


We don't build OpenVG, OSMesa, i915g, GLESv1, GLESv2, and a number of
Gallium state trackers by default.

And while having reasonable defaults for components like EGL and GLES
makes sense, having default drivers doesn't. I think we can roughly
split people who build mesa into two groups:
- developers  users
- distro packagers

Developers and users are going to be building for a particular system
with a single graphics card, so almost always they're going to have to
disable either DRI or Gallium drivers. The current default doesn't
work for them.


As a developer (working in core Mesa a lot), I like to build all the
drivers all the time so that I don't accidentally break something
somewhere.  I don't think I'm the only one who should be doing that.
What configure options would you suggest in that case?


--with-dri-drivers=i915,i965,radeon,r200,nouveau,swrast
--with-gallium-drivers=r300,r600,i915,svga,swrast

or it'd be easy to change configure to support --with-dri-drivers=all
--with-gallium-drivers=all


Distro packagers are either going to build everything they can, or
offer knobs for users to select what they want to build. In the case
of the former, they're not going to depend on our configure script to
tell them what to build, because we already know it doesn't build
everything.

Neither group is served well by selecting a bunch of drivers when none
are requested.

I hope my reasoning is clear now.


The proper fix here is to merge --with-dri-drivers and
--with-gallium-drivers, and have it figure with gallium/dri
drivers to turn based on that list, so:

--with-awesome-new-option=dri-vmwgfx,dri-i965


Merging those options sounds good to me too.


The more I've thought about it, the more I like this. I'll see what I can do.

Matt


I do like the idea of having a single --with-drivers flag instead of 
--with-gallium-drivers and --with-dri-drivers.  Based on the driver 
name, it would do the right thing.


I think --enable-dri could/should be removed too, since it basically 
just lets you do bogus things like --disable-dri --with-dri-drivers=i965.


Which reminds me: can OSMesa and DRI drivers be built at the same time?
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-23 Thread Brian Paul
On Sat, Jan 21, 2012 at 8:47 PM, Matt Turner matts...@gmail.com wrote:
 If you're building mesa, you know what drivers you want.
 ---
 I mentioned this on IRC and a couple of people agreed, we'd rather
 not have to specify an empty list of drivers to not build either
 gallium or dri drivers.

I guess I don't follow what this means.  What drivers are build by
default if nothing special is specified?

-Brian
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-23 Thread Jakob Bornecrantz
- Original Message -
 If you're building mesa, you know what drivers you want.

NACK, the default should be build as much as possible.

The proper fix here is to merge --with-dri-drivers and
--with-gallium-drivers, and have it figure with gallium/dri
drivers to turn based on that list, so:

--with-awesome-new-option=dri-vmwgfx,dri-i965

would build gallium, st/mesa, svga, mesa-core and i965 while:

--with-awesome-new-option=dri-i965

would only build mesa-core and i965.


Cheers, Jakob.

 ---
 I mentioned this on IRC and a couple of people agreed, we'd rather
 not have to specify an empty list of drivers to not build either
 gallium or dri drivers.
 
  configure.ac |   77
  +++---
  1 files changed, 9 insertions(+), 68 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 9599568..656a8d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -160,7 +160,7 @@ AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11
 headers])
  AC_SUBST([X11_INCLUDES])
  
  dnl Compiler macros
 -DEFINES=
 +DEFINES=-DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
  AC_SUBST([DEFINES])
  case $host_os in
  linux*|*-gnu*|gnu*)
 @@ -662,23 +662,17 @@ AC_ARG_ENABLE([gallium_gbm],
  [enable_gallium_gbm=$enableval],
  [enable_gallium_gbm=auto])
  
 -# Option for Gallium drivers
 -GALLIUM_DRIVERS_DEFAULT=r300,r600,svga,swrast
 -
  AC_ARG_WITH([gallium-drivers],
  [AS_HELP_STRING([--with-gallium-drivers@:@=DIRS...@:@],
  [comma delimited Gallium drivers list, e.g.
  i915,nouveau,r300,r600,svga,swrast
 -@:@default=r300,r600,swrast@:@])],
 +@:@default=none@:@])],
  [with_gallium_drivers=$withval],
 -[with_gallium_drivers=$GALLIUM_DRIVERS_DEFAULT])
 +[with_gallium_drivers=''])
  
  # Doing '--without-gallium-drivers' will set this variable to 'no'.
   Clear it
  # here so that the script doesn't choke on an unknown driver name
  later.
 -case $with_gallium_drivers in
 -yes) with_gallium_drivers=$GALLIUM_DRIVERS_DEFAULT ;;
 -no) with_gallium_drivers='' ;;
 -esac
 +test x$with_gallium_drivers = xno  with_gallium_drivers='';
  
  if test x$enable_opengl = xno -a \
  x$enable_gles1 = xno -a \
 @@ -1128,30 +1122,20 @@ dnl Which drivers to build - default is
 chosen by platform
  AC_ARG_WITH([dri-drivers],
  [AS_HELP_STRING([--with-dri-drivers@:@=DIRS...@:@],
  [comma delimited DRI drivers list, e.g.
 -swrast,i965,radeon @:@default=auto@:@])],
 +swrast,i965,radeon @:@default=none@:@])],
  [with_dri_drivers=$withval],
 -[with_dri_drivers=yes])
 -if test x$with_dri_drivers = x; then
 -with_dri_drivers=no
 -fi
 +[with_dri_drivers='no'])
 +test x$with_dri_drivers = x  with_dri_drivers='no';
  
 -dnl If $with_dri_drivers is yes, directories will be added through
 -dnl platform checks
  DRI_DIRS=
  case $with_dri_drivers in
  no) ;;
 -yes)
 -# classic DRI drivers require FEATURE_GL to build
 -if test x$enable_opengl = xyes; then
 -DRI_DIRS=yes
 -fi
 -;;
  *)
  # verify the requested driver directories exist
  dri_drivers=`IFS=', '; echo $with_dri_drivers`
  for driver in $dri_drivers; do
  test -d $srcdir/src/mesa/drivers/dri/$driver || \
 -AC_MSG_ERROR([DRI driver directory '$driver' doesn't
 exist])
 +AC_MSG_ERROR([DRI driver directory '$driver' does not
 exist])
  done
  DRI_DIRS=$dri_drivers
  if test -n $DRI_DIRS -a x$enable_opengl != xyes; then
 @@ -1165,59 +1149,16 @@ if test x$enable_dri = xyes; then
  # Platform specific settings and drivers to build
  case $host_os in
  linux*)
 -DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
  DEFINES=$DEFINES -DHAVE_ALIAS
 -
 -case $host_cpu in
 -x86_64)
 -if test x$DRI_DIRS = xyes; then
 -DRI_DIRS=i915 i965 nouveau r200 radeon swrast
 -fi
 -;;
 -powerpc*)
 -# Build only the drivers for cards that exist on
 PowerPC.
 -if test x$DRI_DIRS = xyes; then
 -DRI_DIRS=r200 radeon swrast
 -fi
 -;;
 -sparc*)
 -# Build only the drivers for cards that exist on sparc
 -if test x$DRI_DIRS = xyes; then
 -DRI_DIRS=r200 radeon swrast
 -fi
 -;;
 -esac
  ;;
  freebsd* | dragonfly* | *netbsd*)
 -DEFINES=$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
 -DEFINES=$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS
 -
 -if test x$DRI_DIRS = xyes; then
 -DRI_DIRS=i915 i965 nouveau r200 radeon swrast
 -fi
 +DEFINES=$DEFINES -DPTHREADS -DHAVE_ALIAS
  ;;
  gnu*)
 -DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
  DEFINES=$DEFINES -DHAVE_ALIAS
   ;;
 -solaris*)
 -DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 -   

Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-23 Thread Matt Turner
On Mon, Jan 23, 2012 at 9:01 AM, Brian Paul brian.e.p...@gmail.com wrote:
 On Sat, Jan 21, 2012 at 8:47 PM, Matt Turner matts...@gmail.com wrote:
 If you're building mesa, you know what drivers you want.
 ---
 I mentioned this on IRC and a couple of people agreed, we'd rather
 not have to specify an empty list of drivers to not build either
 gallium or dri drivers.

 I guess I don't follow what this means.  What drivers are build by
 default if nothing special is specified?

 -Brian

For Gallium, r300, r600, and swrast are built.

For DRI, configure selects what drivers it thinks should be built,
given the platform. It's an okay idea, but it results in a lot of
unnecessary code. Packagers surely know not to build i965 on PowerPC,
for instance. I don't think we need to encode this logic.

For instance, if I'm working on i965, one would think to configure
with ./configure --with-dri-drivers=i965, but this actually builds
i965, Gallium3D, r300g, r600g, and softpipe as well. Similarly if I
configured with ./configure --with-gallium-drivers=r300, I'd get
r300g, radeon, r200, i915, i965, nouvuea_vieux, and swrast.

Some people on IRC agreed that this behavior isn't what they want.

Matt
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-23 Thread Matt Turner
On Mon, Jan 23, 2012 at 9:28 AM, Jakob Bornecrantz ja...@vmware.com wrote:
 - Original Message -
 If you're building mesa, you know what drivers you want.

 NACK, the default should be build as much as possible.

We don't build OpenVG, OSMesa, i915g, GLESv1, GLESv2, and a number of
Gallium state trackers by default.

And while having reasonable defaults for components like EGL and GLES
makes sense, having default drivers doesn't. I think we can roughly
split people who build mesa into two groups:
- developers  users
- distro packagers

Developers and users are going to be building for a particular system
with a single graphics card, so almost always they're going to have to
disable either DRI or Gallium drivers. The current default doesn't
work for them.

Distro packagers are either going to build everything they can, or
offer knobs for users to select what they want to build. In the case
of the former, they're not going to depend on our configure script to
tell them what to build, because we already know it doesn't build
everything.

Neither group is served well by selecting a bunch of drivers when none
are requested.

I hope my reasoning is clear now.

 The proper fix here is to merge --with-dri-drivers and
 --with-gallium-drivers, and have it figure with gallium/dri
 drivers to turn based on that list, so:

 --with-awesome-new-option=dri-vmwgfx,dri-i965

 would build gallium, st/mesa, svga, mesa-core and i965 while:

 --with-awesome-new-option=dri-i965

 would only build mesa-core and i965.

Perhaps, although I'd be mostly satisfied with the current patch. I'll
work on that after the current patch.

Matt
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-23 Thread Tom Stellard
On Mon, 2012-01-23 at 12:37 -0500, Matt Turner wrote:
 On Mon, Jan 23, 2012 at 9:01 AM, Brian Paul brian.e.p...@gmail.com wrote:
  On Sat, Jan 21, 2012 at 8:47 PM, Matt Turner matts...@gmail.com wrote:
  If you're building mesa, you know what drivers you want.
  ---
  I mentioned this on IRC and a couple of people agreed, we'd rather
  not have to specify an empty list of drivers to not build either
  gallium or dri drivers.
 
  I guess I don't follow what this means.  What drivers are build by
  default if nothing special is specified?
 
  -Brian
 
 For Gallium, r300, r600, and swrast are built.
 
 For DRI, configure selects what drivers it thinks should be built,
 given the platform. It's an okay idea, but it results in a lot of
 unnecessary code. Packagers surely know not to build i965 on PowerPC,
 for instance. I don't think we need to encode this logic.
 
 For instance, if I'm working on i965, one would think to configure
 with ./configure --with-dri-drivers=i965, but this actually builds
 i965, Gallium3D, r300g, r600g, and softpipe as well. Similarly if I
 configured with ./configure --with-gallium-drivers=r300, I'd get
 r300g, radeon, r200, i915, i965, nouvuea_vieux, and swrast.
 

I agree, this behavior is not very friendly to users.  If I build
with ./configure --with-gallium-drivers=r300, then configure will fail
with an error saying I need to install libdrm_intel, which is very
confusing for users trying to build for the first time.

I think Jakob's suggestion to merge the --with-gallium-drivers and
--with-dri-drivers into a single option is a good solution to this
problem.

-Tom


 Some people on IRC agreed that this behavior isn't what they want.
 
 Matt
 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev
 



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] Don't set defaults for gallium and dri drivers

2012-01-21 Thread Matt Turner
If you're building mesa, you know what drivers you want.
---
I mentioned this on IRC and a couple of people agreed, we'd rather
not have to specify an empty list of drivers to not build either
gallium or dri drivers.

 configure.ac |   77 +++---
 1 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9599568..656a8d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,7 @@ AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])
 AC_SUBST([X11_INCLUDES])
 
 dnl Compiler macros
-DEFINES=
+DEFINES=-DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 AC_SUBST([DEFINES])
 case $host_os in
 linux*|*-gnu*|gnu*)
@@ -662,23 +662,17 @@ AC_ARG_ENABLE([gallium_gbm],
 [enable_gallium_gbm=$enableval],
 [enable_gallium_gbm=auto])
 
-# Option for Gallium drivers
-GALLIUM_DRIVERS_DEFAULT=r300,r600,svga,swrast
-
 AC_ARG_WITH([gallium-drivers],
 [AS_HELP_STRING([--with-gallium-drivers@:@=DIRS...@:@],
 [comma delimited Gallium drivers list, e.g.
 i915,nouveau,r300,r600,svga,swrast
-@:@default=r300,r600,swrast@:@])],
+@:@default=none@:@])],
 [with_gallium_drivers=$withval],
-[with_gallium_drivers=$GALLIUM_DRIVERS_DEFAULT])
+[with_gallium_drivers=''])
 
 # Doing '--without-gallium-drivers' will set this variable to 'no'.  Clear it
 # here so that the script doesn't choke on an unknown driver name later.
-case $with_gallium_drivers in
-yes) with_gallium_drivers=$GALLIUM_DRIVERS_DEFAULT ;;
-no) with_gallium_drivers='' ;;
-esac
+test x$with_gallium_drivers = xno  with_gallium_drivers='';
 
 if test x$enable_opengl = xno -a \
 x$enable_gles1 = xno -a \
@@ -1128,30 +1122,20 @@ dnl Which drivers to build - default is chosen by 
platform
 AC_ARG_WITH([dri-drivers],
 [AS_HELP_STRING([--with-dri-drivers@:@=DIRS...@:@],
 [comma delimited DRI drivers list, e.g.
-swrast,i965,radeon @:@default=auto@:@])],
+swrast,i965,radeon @:@default=none@:@])],
 [with_dri_drivers=$withval],
-[with_dri_drivers=yes])
-if test x$with_dri_drivers = x; then
-with_dri_drivers=no
-fi
+[with_dri_drivers='no'])
+test x$with_dri_drivers = x  with_dri_drivers='no';
 
-dnl If $with_dri_drivers is yes, directories will be added through
-dnl platform checks
 DRI_DIRS=
 case $with_dri_drivers in
 no) ;;
-yes)
-# classic DRI drivers require FEATURE_GL to build
-if test x$enable_opengl = xyes; then
-DRI_DIRS=yes
-fi
-;;
 *)
 # verify the requested driver directories exist
 dri_drivers=`IFS=', '; echo $with_dri_drivers`
 for driver in $dri_drivers; do
 test -d $srcdir/src/mesa/drivers/dri/$driver || \
-AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])
+AC_MSG_ERROR([DRI driver directory '$driver' does not exist])
 done
 DRI_DIRS=$dri_drivers
 if test -n $DRI_DIRS -a x$enable_opengl != xyes; then
@@ -1165,59 +1149,16 @@ if test x$enable_dri = xyes; then
 # Platform specific settings and drivers to build
 case $host_os in
 linux*)
-DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 DEFINES=$DEFINES -DHAVE_ALIAS
-
-case $host_cpu in
-x86_64)
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=i915 i965 nouveau r200 radeon swrast
-fi
-;;
-powerpc*)
-# Build only the drivers for cards that exist on PowerPC.
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=r200 radeon swrast
-fi
-;;
-sparc*)
-# Build only the drivers for cards that exist on sparc
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=r200 radeon swrast
-fi
-;;
-esac
 ;;
 freebsd* | dragonfly* | *netbsd*)
-DEFINES=$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
-DEFINES=$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS
-
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=i915 i965 nouveau r200 radeon swrast
-fi
+DEFINES=$DEFINES -DPTHREADS -DHAVE_ALIAS
 ;;
 gnu*)
-DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
 DEFINES=$DEFINES -DHAVE_ALIAS
;;
-solaris*)
-DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
-;;
-cygwin*)
-DEFINES=$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=swrast
-fi
-;;
 esac
 
-# default drivers
-if test x$DRI_DIRS = xyes; then
-DRI_DIRS=i915 i965 nouveau r200 radeon swrast
-fi
-
-DRI_DIRS=`echo $DRI_DIRS | $SED 's/  */ /g'`
-
 # Check for expat
 if test x$enable_dri = xyes; then
 EXPAT_INCLUDES=
-- 
1.7.3.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org