From cb4a2d732001d32fa1e95bb15e047da12b6c9754 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 26 May 2015 16:22:40 +0200 Subject: Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree. The client-side library libNX_GL.{a,so} is not built when building nx-libs. However, nx-X11/lib/GL/** ships several imake include files (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**. These files have been moved from the nx-X11/lib/GL/ code subtree to the nx-X11/programs/Xserver/GL/. Furthermore, we don't provide module builds of the GL extension anymore, as that feature is neither used in nx-libs. --- nx-X11/config/cf/xfree86.cf | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'nx-X11/config/cf/xfree86.cf') diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 673902129..11c6a95c9 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -1282,14 +1282,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #if BuildXF86DRI -#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 @@ -1538,9 +1530,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #ifndef BuildXF86VidModeLibrary # define BuildXF86VidModeLibrary YES #endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif #endif /* -- cgit v1.2.3 From 5cd80d272ba366686a3b28c5915cb5bf3ada8985 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 27 May 2015 08:10:38 +0200 Subject: imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.). --- nx-X11/config/cf/xfree86.cf | 242 +++----------------------------------------- 1 file changed, 13 insertions(+), 229 deletions(-) (limited to 'nx-X11/config/cf/xfree86.cf') diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 11c6a95c9..367835170 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -346,24 +346,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif -/* - * DRI drivers under development, or drivers included on this platform - * only for build testing. - */ -# ifndef DevelDRIDrivers -# if XFree86Devel -# define DevelDRIDrivers ffb -# else -# define DevelDRIDrivers /**/ -# endif -# endif - -# ifndef DriDrivers -# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ - sis tdfx DevelDRIDrivers -# endif -#endif - #if defined(AMD64Architecture) # ifndef XF86Server # define XF86Server YES @@ -446,13 +428,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ vga dummy fbdev vesa # endif -/* DRI tdfx driver needs Glide, which is not available for AMD64 */ -# define TdfxDriDriver /**/ - -# define DevelDRIDrivers /**/ - -# define DriDrivers gamma i810 mga r128 radeon r200 \ - TdfxDriDriver DevelDRIDrivers #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -555,10 +530,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ XF86OSCardDrivers XF86ExtraCardDrivers \ DevelDrivers # endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - #endif /* Sparc64 Drivers */ @@ -653,10 +624,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers /**/ -# endif #endif /* MIPS drivers */ @@ -833,9 +800,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ savage nv cirrus DevelDrivers siliconmotion \ vga XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ -# endif #endif /* @@ -929,9 +893,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif #endif /* @@ -1021,14 +982,6 @@ 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 tdfx mga r128 radeon r200 -# endif #endif /* SuperH drivers */ @@ -1191,14 +1144,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma r128 -# endif #endif /* @@ -1272,190 +1217,29 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -/* - * 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 GlxBuiltInI830 -# define GlxBuiltInI830 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 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - 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 GlxBuiltInI830 -# define DriDrivers i830 -# 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 - -#endif +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif # ifndef UseX86Emu # define UseX86Emu YES -- cgit v1.2.3