diff options
| author | dawes <dawes> | 2002-02-14 19:47:25 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2002-02-14 19:47:25 +0000 |
| commit | 674ea058d11ef5ae7007847a2d0c1c671f75aaaa (patch) | |
| tree | 5f35a3299aca5876c83f9e3b212766433b111b9e | |
| parent | d0e8973f8bcb753c712f660c5ee1a0154b6f7420 (diff) | |
Don't use HasGlide3 any more. The Glide3 settings are left for nowmesa-4-0-20020214mesa-4-0-branch
in case any 3rd-party apps rely on them.
| -rw-r--r-- | xc/config/cf/host.def | 4 | ||||
| -rw-r--r-- | xc/config/cf/xf86site.def | 2 | ||||
| -rw-r--r-- | xc/config/cf/xfree86.cf | 21 |
3 files changed, 6 insertions, 21 deletions
diff --git a/xc/config/cf/host.def b/xc/config/cf/host.def index 4f9b1aac3..8362f429d 100644 --- a/xc/config/cf/host.def +++ b/xc/config/cf/host.def @@ -19,6 +19,8 @@ #define XF86CardDrivers tdfx i810 mga ati glint vga +#define DriDrivers ffb tdfx mga i810 r128 radeon gamma /* i830 sis */ + #define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ -Wnested-externs @@ -39,8 +41,6 @@ -#define HasGlide3 YES - /* To do profiling of the dynamically loaded 'xyz_dri.so' object, turn * this on. * Use 'xc/lib/GL/makeprofile.sh' to make it work. diff --git a/xc/config/cf/xf86site.def b/xc/config/cf/xf86site.def index 6e9d86817..8df8856cf 100644 --- a/xc/config/cf/xf86site.def +++ b/xc/config/cf/xf86site.def @@ -738,7 +738,7 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.179 2002/01/16 18:36:00 dawes Exp */ /* - * The 3Dfx 3D DRI driver requires glide 3. + * Have glide 3? * #define HasGlide3 YES */ diff --git a/xc/config/cf/xfree86.cf b/xc/config/cf/xfree86.cf index a256b330e..5b4f77f11 100644 --- a/xc/config/cf/xfree86.cf +++ b/xc/config/cf/xfree86.cf @@ -313,13 +313,8 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ siliconmotion \ vesa vga XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif # ifndef DriDrivers -# define DriDrivers gamma TdfxDriDriver mga i810 i830 r128 radeon sis +# define DriDrivers gamma tdfx mga i810 i830 r128 radeon sis # endif #endif @@ -561,13 +556,8 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ savage nv DevelDrivers siliconmotion vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif # ifndef DriDrivers -# define DriDrivers gamma TdfxDriDriver mga r128 radeon sis +# define DriDrivers gamma tdfx mga r128 radeon sis # endif #endif @@ -657,13 +647,8 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif # ifndef DriDrivers -# define DriDrivers gamma TdfxDriDriver mga r128 radeon +# define DriDrivers gamma tdfx mga r128 radeon # endif #endif |