aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/config/cf/xorg.cf
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/config/cf/xorg.cf')
-rw-r--r--nx-X11/config/cf/xorg.cf253
1 files changed, 14 insertions, 239 deletions
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 1ef1260b4..c92162ef0 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -270,13 +270,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
#define HasAgpGart NO
#endif
-/* Some DRI drivers are disabled because they are either insecure or unusable on
- * this architecture. This switch allows you to enable building these drivers.
- */
-#ifndef BuildDevelDRIDrivers
-#define BuildDevelDRIDrivers NO
-#endif
-
/* The glide driver only works for the loadable server at the moment */
#ifndef HasGlide2
#define HasGlide2 NO
@@ -399,20 +392,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
vesa vga \
dummy XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-
-# ifndef DevelDRIDrivers
-# define DevelDRIDrivers ffb mach64 unichrome
-# endif
-
-# ifndef DriDrivers
-# ifndef ia64Architecture
-# define i386DRIDrivers i810 i915 sis
-# else
- /* SiS is 64-bit unclean as of this writing. */
-# define i386DRIDrivers /**/
-# endif
-# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx
-# endif
#endif /* i386Architecture || ia64Architecture */
#if defined(AMD64Architecture)
@@ -445,11 +424,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
vga dummy vesa i810 vmware \
XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers
# endif
-
-/* SiS is 64-bit unclean as of this writing. */
-# ifndef DriDrivers
-# define DriDrivers i915 mga r128 radeon r200 tdfx
-# endif
#endif /*AMD64Arcitecture*/
/* SPARC and UltraSPARC drivers */
@@ -500,10 +474,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
DevelDrivers
# endif
# endif
-# ifndef DriDrivers
-# define DriDrivers ffb
-# endif
-
#endif
/* Sparc64 Drivers */
@@ -584,13 +554,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
vga dummy XF86OSCardDrivers \
XF86ExtraCardDrivers
# endif
-/*
- * Glide is available for Alpha, therefore build tdfx DRM module.
- * SiS is 64-bit unclean as of this writing.
- */
-# ifndef DriDrivers
-# define DriDrivers tdfx mga r128 radeon r200
-# endif
#endif /* AlphaArchitecture */
/*
@@ -621,10 +584,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
DevelDrivers vga dummy \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-/* The tdfx driver needs Glide, which is not available for PPC. */
-# ifndef DriDrivers
-# define DriDrivers mga r128 radeon r200
-# endif
#endif /* PpcArchitecture || Mc68020Architecture */
/*
@@ -651,9 +610,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
DevelDrivers vga dummy \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-# ifndef DriDrivers
-# define DriDrivers mga r128 radeon r200
-# endif
#endif
/* SuperH drivers */
@@ -751,10 +707,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString
DevelDrivers \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-# define TdfxDriDriver /**/
-# ifndef DriDrivers
-# define DriDrivers r128
-# endif
#endif /* Ppc64Architecture */
/*
@@ -828,205 +780,30 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define BuildGlxExt YES
#endif
-#ifndef BuildXF86DRI
-#define BuildXF86DRI NO
-#endif
-
-#ifndef GlxUseSGISI
-#define GlxUseSGISI NO
-#endif
-
-#if BuildXF86DRI
-
-#ifndef DriDrivers
-#define DriDrivers /**/
-#endif
-
-#ifndef DevelDRIDrivers
-#define DevelDRIDrivers /**/
-#endif
-
-#ifndef BuildGLXLibrary
-# if defined (BuildServersOnly) && BuildServersOnly
-# define BuildGLXLibrary NO
-# else
-# define BuildGLXLibrary YES
-# endif
-#endif
-
-/*
- * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES.
- * If more than one are defined, the compilation will fail with multiply
- * defined references of GLX and OpenGL functions.
- */
-
-/*
- * The first is a built-in driver that does software rendering client-side
- * and renders to the X server via Xlib.
- */
-
-# ifndef GlxBuiltInXMesa
-# define GlxBuiltInXMesa NO
-# endif
-
-/*
- * The rest are hardware-specific DRI drivers.
- */
-# ifndef GlxBuiltInGamma
-# define GlxBuiltInGamma NO
-# endif
-# ifndef GlxBuiltInTdfx
-# define GlxBuiltInTdfx NO
-# endif
-# ifndef GlxBuiltInMga
-# define GlxBuiltInMga NO
-# endif
-# ifndef GlxBuiltInI810
-# define GlxBuiltInI810 NO
-# endif
-# ifndef GlxBuiltInI915
-# define GlxBuiltInI915 NO
-# endif
-# ifndef GlxBuiltInR128
-# define GlxBuiltInR128 NO
-# endif
-# ifndef GlxBuiltInRadeon
-# define GlxBuiltInRadeon NO
-# endif
-# ifndef GlxBuiltInR200
-# define GlxBuiltInR200 NO
-# endif
-# ifndef GlxBuiltInFfb
-# define GlxBuiltInFfb NO
-# endif
-# ifndef GlxBuiltInSIS
-# define GlxBuiltInSIS NO
-# endif
-
-# if GlxBuiltInTdfx || \
- GlxBuiltInMga || \
- GlxBuiltInI810 || \
- GlxBuiltInI915 || \
- GlxBuiltInR128 || \
- GlxBuiltInRadeon || \
- GlxBuiltInR200 || \
- GlxBuiltInFfb || \
- GlxBuiltInSIS
-# define GlxDriverUsesMesa YES
-# else
-# define GlxDriverUsesMesa NO
-# endif
-
-# if GlxBuiltInGamma || \
- GlxBuiltInTdfx || \
- GlxBuiltInMga || \
- GlxBuiltInI810 || \
- GlxBuiltInI915 || \
- GlxBuiltInR128 || \
- GlxBuiltInRadeon || \
- GlxBuiltInR200 || \
- GlxBuiltInFfb || \
- GlxBuiltInSIS
-# define GlxUseBuiltInDRIDriver YES
-# define DRIDynLoadDefines /**/
-# else
-# define GlxUseBuiltInDRIDriver NO
-# define DRIDynLoadDefines -DGLX_USE_DLOPEN
-# endif
-
-# if GlxUseBuiltInDRIDriver
-# undef DriDrivers
-# if GlxBuiltInGamma
-# define DriDrivers gamma
-# endif
-# if GlxBuiltInTdfx
-# define DriDrivers tdfx
-# endif
-# if GlxBuiltInMga
-# define DriDrivers mga
-# endif
-# if GlxBuiltInI810
-# define DriDrivers i810
-# endif
-# if GlxBuiltInI915
-# define DriDrivers i915
-# endif
-# if GlxBuiltInR128
-# define DriDrivers r128
-# endif
-# if GlxBuiltInRadeon
-# define DriDrivers radeon
-# endif
-# if GlxBuiltInR200
-# define DriDrivers r200
-# endif
-# if GlxBuiltInSIS
-# define DriDrivers sis
-# endif
-# if GlxBuiltInFfb
-# define DriDrivers ffb
-# endif
-# endif
-
-#endif
-
-/*
- * This enables building DRI support into video drivers, which can be done
- * even on platforms that don't have functional DRI support.
- *
- * Defining BuildXF86DRIDriverSupport to YES will not work until we have a
- * separate set of defines set up for building driver-only support for the
- * DRI.
- */
-#ifndef BuildXF86DRIDriverSupport
-# define BuildXF86DRIDriverSupport NO
-#endif
-
#if BuildGlxExt
-# if BuildXF86DRI
-# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines
-# else
-# define DRIDefines /**/
-# endif
-# if defined(GlxUseSGISI) && GlxUseSGISI
-# define GlxCoreLibDefines -DGLX_USE_SGI_SI
-# else
-# define GlxCoreLibDefines -DGLX_USE_MESA
-# endif
+# define GlxCoreLibDefines -DGLX_USE_MESA
-# if defined(SparcArchitecture) \
+# if defined(SparcArchitecture) \
|| defined (Sparc64Architecture) \
|| defined(ia64Architecture) \
|| defined(s390xArchitecture) \
|| defined(AMD64Architecture)
-# define GlxArchDefines -D__GLX_ALIGN64
-# elif defined(AlphaArchitecture)
+# define GlxArchDefines -D__GLX_ALIGN64
+# elif defined(AlphaArchitecture)
/* On the Alpha we need to ensure floating point accuracy for 3D */
-# define GlxArchDefines -D__GLX_ALIGN64 -mieee
-# elif defined(DarwinArchitecture)
+# define GlxArchDefines -D__GLX_ALIGN64 -mieee
+# elif defined(DarwinArchitecture)
/* GLX contains lots of uninitialized globals, which can upset Darwin */
-# define GlxArchDefines -fno-common
-# else
-# define GlxArchDefines /**/
-# endif
-
-# ifndef GlxExtraDefines
-# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines
-# endif
-
-#else
-
-/* If we are not building GLX, then make sure the DRI is not built */
-# undef BuildXF86DRI
-# define BuildXF86DRI NO
-# undef BuildXF86DRIDriverSupport
-# define BuildXF86DRIDriverSupport NO
+# define GlxArchDefines -fno-common
+# else
+# define GlxArchDefines /**/
+# endif
-#endif
+# ifndef GlxExtraDefines
+# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines
+# endif
-#if !BuildXF86DRI
-# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */
#endif
# ifndef UseX86Emu
@@ -1102,9 +879,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
#ifndef BuildXF86VidModeLibrary
# define BuildXF86VidModeLibrary YES
#endif
-#ifndef BuildGLXLibrary
-# define BuildGLXLibrary YES
-#endif
#endif
/*
@@ -1572,6 +1346,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
# define LargePositionIndependentCFlags -fPIC
#endif
+
#ifndef XF8_32Wid
# define XF8_32Wid NO
#endif