diff options
25 files changed, 17 insertions, 308 deletions
diff --git a/configs/linux-solo b/configs/linux-solo index 3b125d9e2a..07aa94ad9f 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -8,7 +8,7 @@ CONFIG_NAME = linux-solo CC = gcc CXX = g++ -CCOMMON = -D_SOLO -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L +CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L CFLAGS = $(CCOMMON) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 83d5a8ff32..99dc064826 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -32,7 +32,7 @@ #include "extensions.h" #include "utils.h" -#if !defined( DRI_NEW_INTERFACE_ONLY ) && !defined( _SOLO ) +#if !defined( DRI_NEW_INTERFACE_ONLY ) #include "xf86dri.h" /* For XF86DRIQueryVersion prototype. */ #endif @@ -171,7 +171,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv, "but got version %d.%d.%d"; int major, minor, patch; -#ifndef _SOLO /* Check the DRI version */ if (XF86DRIQueryVersion(sPriv->display, &major, &minor, &patch)) { if (major != dri_major || minor < dri_minor) { @@ -187,9 +186,6 @@ driCheckDriDdxDrmVersions(__DRIscreenPrivate *sPriv, sPriv->ddxMajor, sPriv->ddxMinor, sPriv->ddxPatch); return GL_FALSE; } -#else - (void)major;(void)minor;(void)patch; -#endif /* Check that the DRM driver version is compatible */ if (sPriv->drmMajor != drm_major || sPriv->drmMinor < drm_minor) { diff --git a/src/mesa/drivers/dri/common/vblank.c b/src/mesa/drivers/dri/common/vblank.c index d20f743bc9..aaeaebb036 100644 --- a/src/mesa/drivers/dri/common/vblank.c +++ b/src/mesa/drivers/dri/common/vblank.c @@ -128,11 +128,7 @@ int driWaitForMSC32( __DRIdrawablePrivate *priv, if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) { /* FIXME: This doesn't seem like the right thing to return here. */ -#ifndef _SOLO return GLX_BAD_CONTEXT; -#else - return -1; -#endif } dont_wait = 0; @@ -163,11 +159,7 @@ int driWaitForMSC32( __DRIdrawablePrivate *priv, if ( drmWaitVBlank( priv->driScreenPriv->fd, &vbl ) != 0 ) { /* FIXME: This doesn't seem like the right thing to return here. */ -#ifndef _SOLO return GLX_BAD_CONTEXT; -#else - return -1; -#endif } } @@ -226,11 +218,9 @@ GLuint driGetDefaultVBlankFlags( const driOptionCache *optionCache ) void driDrawableInitVBlank( __DRIdrawablePrivate *priv, GLuint flags ) { -#ifndef _SOLO if ( priv->pdraw->swap_interval == (unsigned)-1 ) { priv->pdraw->swap_interval = (flags & VBLANK_FLAG_THROTTLE) != 0 ? 1 : 0; } -#endif } @@ -328,11 +318,7 @@ driWaitForVBlank( const __DRIdrawablePrivate *priv, GLuint * vbl_seq, vbl.request.type = DRM_VBLANK_ABSOLUTE; if ( (flags & VBLANK_FLAG_INTERVAL) != 0 ) { -#ifndef _SOLO interval = priv->pdraw->swap_interval; -#else - interval = 0; -#endif /* this must have been initialized when the drawable was first bound * to a direct rendering context. */ assert ( interval != (unsigned)-1 ); diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c index f5e07de4ed..698abd8fca 100644 --- a/src/mesa/drivers/dri/common/xmlconfig.c +++ b/src/mesa/drivers/dri/common/xmlconfig.c @@ -34,6 +34,7 @@ #include <expat.h> #include <fcntl.h> #include <unistd.h> +#define __USE_GNU /* defines program_invocation_short_name */ #include <errno.h> #include "imports.h" #include "dri_util.h" @@ -900,11 +901,7 @@ void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info, userData.cache = cache; userData.screenNum = screenNum; userData.driverName = driverName; -#ifndef _SOLO userData.execName = GET_PROGRAM_NAME(); -#else - userData.execName = "Solo"; -#endif if ((home = getenv ("HOME"))) { GLuint len = strlen (home); diff --git a/src/mesa/drivers/dri/ffb/server/ffb_dac.h b/src/mesa/drivers/dri/ffb/server/ffb_dac.h index 2b3d1f42ac..5e4b5ff815 100644 --- a/src/mesa/drivers/dri/ffb/server/ffb_dac.h +++ b/src/mesa/drivers/dri/ffb/server/ffb_dac.h @@ -26,7 +26,7 @@ #ifndef _FFB_DAC_H #define _FFB_DAC_H -#if defined( _SOLO ) || defined( DRI_NEW_INTERFACE_ONLY ) +#if defined( DRI_NEW_INTERFACE_ONLY ) #define Bool int #endif diff --git a/src/mesa/drivers/dri/gamma/gamma_xmesa.c b/src/mesa/drivers/dri/gamma/gamma_xmesa.c index 30c2ba023a..64ba0d909a 100644 --- a/src/mesa/drivers/dri/gamma/gamma_xmesa.c +++ b/src/mesa/drivers/dri/gamma/gamma_xmesa.c @@ -262,7 +262,6 @@ static struct __DriverAPIRec gammaAPI = { * The __driCreateScreen name is the symbol that libGL.so fetches. * Return: pointer to a __DRIscreenPrivate. */ -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -270,12 +269,3 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &gammaAPI); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &gammaAPI); - return (void *) psp; -} -#endif diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c index 8c0c0766f3..f87a205f20 100644 --- a/src/mesa/drivers/dri/i810/i810screen.c +++ b/src/mesa/drivers/dri/i810/i810screen.c @@ -49,9 +49,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "i810tris.h" #include "i810ioctl.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif #ifdef USE_NEW_INTERFACE static PFNGLXCREATECONTEXTMODES create_context_modes = NULL; @@ -384,7 +382,6 @@ static const struct __DriverAPIRec i810API = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -392,15 +389,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i810API); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &i810API); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/i830/i830_screen.c b/src/mesa/drivers/dri/i830/i830_screen.c index a9a25d0045..52aa22d9d1 100644 --- a/src/mesa/drivers/dri/i830/i830_screen.c +++ b/src/mesa/drivers/dri/i830/i830_screen.c @@ -277,7 +277,6 @@ static GLboolean i830InitDriver(__DRIscreenPrivate *sPriv) } #endif -#ifndef _SOLO if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -292,7 +291,6 @@ static GLboolean i830InitDriver(__DRIscreenPrivate *sPriv) } } } -#endif return GL_TRUE; } @@ -365,7 +363,6 @@ static const struct __DriverAPIRec i830API = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -373,15 +370,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i830API); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &i830API); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 6881346e5c..89dc159f8a 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -181,7 +181,6 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) } } -#ifndef _SOLO if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -204,7 +203,6 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv) } } } -#endif return GL_TRUE; } @@ -315,7 +313,6 @@ static const struct __DriverAPIRec intelAPI = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -323,15 +320,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &intelAPI); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &i830API); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index 0d717da51b..a6cb8b95db 100644 --- a/src/mesa/drivers/dri/mach64/mach64_screen.c +++ b/src/mesa/drivers/dri/mach64/mach64_screen.c @@ -40,9 +40,7 @@ #include "utils.h" #include "vblank.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif /* Mach64 configuration */ @@ -314,7 +312,6 @@ mach64CreateScreen( __DRIscreenPrivate *sPriv ) } mach64Screen->driScreen = sPriv; -#ifndef _SOLO if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -330,7 +327,6 @@ mach64CreateScreen( __DRIscreenPrivate *sPriv ) (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" ); } } -#endif return mach64Screen; } @@ -451,7 +447,6 @@ static struct __DriverAPIRec mach64API = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -459,15 +454,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mach64API); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &mach64API); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index af96d7c86b..b6f99caa51 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -59,9 +59,7 @@ #include "utils.h" #include "vblank.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif /* MGA configuration */ @@ -260,7 +258,7 @@ mgaInitDriver(__DRIscreenPrivate *sPriv) mgaScreen->linecomp_sane = (sPriv->ddxMajor > 1) || (sPriv->ddxMinor > 1) || ((sPriv->ddxMinor == 1) && (sPriv->ddxPatch > 0)); -#ifndef _SOLO + if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -282,7 +280,6 @@ mgaInitDriver(__DRIscreenPrivate *sPriv) } } } -#endif if (serverInfo->chipset != MGA_CARD_TYPE_G200 && serverInfo->chipset != MGA_CARD_TYPE_G400) { @@ -688,14 +685,11 @@ mgaCreateContext( const __GLcontextModes *mesaVis, mmesa->vblank_flags = ((mmesa->mgaScreen->irq == 0) || !mmesa->mgaScreen->linecomp_sane) ? VBLANK_FLAG_NO_IRQ : driGetDefaultVBlankFlags(&mmesa->optionCache); -#ifndef _SOLO + mmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" ); if ( mmesa->get_ust == NULL ) { mmesa->get_ust = get_ust_nop; } -#else - mmesa->get_ust = get_ust_nop; -#endif (*mmesa->get_ust)( & mmesa->swap_ust ); @@ -913,7 +907,6 @@ static const struct __DriverAPIRec mgaAPI = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -921,15 +914,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mgaAPI); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &mgaAPI); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ diff --git a/src/mesa/drivers/dri/mga/mgastate.c b/src/mesa/drivers/dri/mga/mgastate.c index fce083689b..fd00de43c2 100644 --- a/src/mesa/drivers/dri/mga/mgastate.c +++ b/src/mesa/drivers/dri/mga/mgastate.c @@ -803,10 +803,9 @@ void mgaUpdateRects( mgaContextPtr mmesa, GLuint buffers ) else mgaXMesaSetBackClipRects( mmesa ); -#ifndef _SOLO sarea->req_drawable = driDrawable->draw; sarea->req_draw_buffer = mmesa->draw_buffer; -#endif + mgaUpdateClipping( mmesa->glCtx ); mgaCalcViewport( mmesa->glCtx ); diff --git a/src/mesa/drivers/dri/r128/r128_screen.c b/src/mesa/drivers/dri/r128/r128_screen.c index 3b44229da2..6d0fd9d1a1 100644 --- a/src/mesa/drivers/dri/r128/r128_screen.c +++ b/src/mesa/drivers/dri/r128/r128_screen.c @@ -46,9 +46,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "utils.h" #include "vblank.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif /* R128 configuration */ @@ -210,7 +208,6 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) } r128Screen->driScreen = sPriv; -#ifndef _SOLO if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -226,7 +223,6 @@ r128CreateScreen( __DRIscreenPrivate *sPriv ) (*glx_enable_extension)( psc, "GLX_MESA_swap_frame_usage" ); } } -#endif return r128Screen; } @@ -353,7 +349,6 @@ static struct __DriverAPIRec r128API = { * The __driCreateScreen name is the symbol that libGL.so fetches. * Return: pointer to a __DRIscreenPrivate. */ -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -361,15 +356,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r128API); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &r128API); - return (void *) psp; -} -#endif #endif /* DRI_NEW_INTERFACE_ONLY */ diff --git a/src/mesa/drivers/dri/r128/server/r128.h b/src/mesa/drivers/dri/r128/server/r128.h index 6420c32c03..15e25285b6 100644 --- a/src/mesa/drivers/dri/r128/server/r128.h +++ b/src/mesa/drivers/dri/r128/server/r128.h @@ -39,33 +39,6 @@ #define _R128_H_ #include "dri_util.h" -#ifndef _SOLO -#include "xf86str.h" - - /* PCI support */ -#include "xf86Pci.h" - - /* XAA and Cursor Support */ -#include "xaa.h" -#include "xf86Cursor.h" - - /* DDC support */ -#include "xf86DDC.h" - - /* Xv support */ -#include "xf86xv.h" - - /* DRI support */ -#ifdef XF86DRI -#define _XF86DRI_SERVER_ -#include "r128_dripriv.h" -#include "dri.h" -#include "GL/glxint.h" -#endif -#endif -#ifdef _SOLO -#define XF86DRI -#endif #define R128_DEBUG 0 /* Turn off debugging output */ #define R128_IDLE_RETRY 32 /* Fall out of idle loops after this count */ @@ -184,31 +157,7 @@ typedef struct { uint32_t palette[256]; } R128SaveRec, *R128SavePtr; -#ifndef _SOLO -typedef struct { - CARD16 reference_freq; - CARD16 reference_div; - uint32_t min_pll_freq; - uint32_t max_pll_freq; - CARD16 xclk; -} R128PLLRec, *R128PLLPtr; - -typedef struct { - int bitsPerPixel; - int depth; - int displayWidth; - int pixel_code; - int pixel_bytes; - DisplayModePtr mode; -} R128FBLayout; -#endif - typedef struct { -#ifndef _SOLO - EntityInfoPtr pEnt; - pciVideoPtr PciInfo; - PCITAG PciTag; -#endif int Chipset; GLboolean Primary; @@ -225,13 +174,6 @@ typedef struct { unsigned long FbMapSize; /* Size of frame buffer, in bytes */ int Flags; /* Saved copy of mode flags */ -#ifndef _SOLO - uint8_t BIOSDisplay; /* Device the BIOS is set to display to */ - - GLboolean HasPanelRegs; /* Current chip can connect to a FP */ - uint8_t *VBIOS; /* Video BIOS for mode validation on FPs */ - int FPBIOSstart; /* Start of the flat panel info */ -#endif /* Computed values for FPs */ int PanelXRes; int PanelYRes; @@ -242,21 +184,7 @@ typedef struct { int VSyncWidth; int VBlank; int PanelPwrDly; -#ifndef _SOLO - R128PLLRec pll; - R128RAMPtr ram; - - R128SaveRec SavedReg; /* Original (text) mode */ - R128SaveRec ModeReg; /* Current mode */ - GLboolean (*CloseScreen)(int, ScreenPtr); - void (*BlockHandler)(int, pointer, pointer, pointer); - - GLboolean PaletteSavedOnVT; /* Palette saved on last VT switch */ - - XAAInfoRecPtr accel; - GLboolean accelOn; - xf86CursorInfoPtr cursor; -#endif + unsigned long cursor_start; unsigned long cursor_end; @@ -286,35 +214,19 @@ typedef struct { int scanline_y; int scanline_w; int scanline_h; -#ifdef XF86DRI + int scanline_hpass; int scanline_x1clip; int scanline_x2clip; int scanline_rop; int scanline_fg; int scanline_bg; -#endif /* XF86DRI */ + int scanline_words; int scanline_direct; int scanline_bpp; /* Only used for ImageWrite */ -#ifndef _SOLO - DGAModePtr DGAModes; - int numDGAModes; - GLboolean DGAactive; - int DGAViewportStatus; - DGAFunctionRec DGAFuncs; - - R128FBLayout CurrentLayout; -#endif -#ifdef XF86DRI drm_context_t drmCtx; -#ifndef _SOLO - DRIInfoPtr pDRIInfo; - int numVisualConfigs; - __GLXvisualConfig *pVisualConfigs; - R128ConfigPrivPtr pVisualConfigsPriv; -#endif drmSize registerSize; drm_handle_t registerHandle; @@ -408,20 +320,7 @@ typedef struct { uint32_t gen_int_cntl; GLboolean DMAForXv; -#endif -#ifndef _SOLO - XF86VideoAdaptorPtr adaptor; - void (*VideoTimerCallback)(ScrnInfoPtr, Time); - int videoKey; - GLboolean showCache; - OptionInfoPtr Options; - - GLboolean isDFP; - GLboolean isPro2; - I2CBusPtr pI2CBus; - uint32_t DDCReg; -#endif } R128InfoRec, *R128InfoPtr; #define R128WaitForFifo(pScrn, entries) \ diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 3751ad47b2..9afca20b7a 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -443,14 +443,11 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, rmesa->prefer_gart_client_texturing = (getenv("R200_GART_CLIENT_TEXTURES") != 0); -#ifndef _SOLO + rmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" ); if ( rmesa->get_ust == NULL ) { rmesa->get_ust = get_ust_nop; } -#else - rmesa->get_ust = get_ust_nop; -#endif (*rmesa->get_ust)( & rmesa->swap_ust ); diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.c b/src/mesa/drivers/dri/r200/r200_ioctl.c index fcf396c141..54875d5d22 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.c +++ b/src/mesa/drivers/dri/r200/r200_ioctl.c @@ -782,7 +782,6 @@ void r200Finish( GLcontext *ctx ) * the kernel data structures, and the current context to get the * device fd. */ -#ifndef _SOLO void *r200AllocateMemoryMESA(__DRInativeDisplay *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority) @@ -889,7 +888,6 @@ GLuint r200GetMemoryOffsetMESA(__DRInativeDisplay *dpy, int scrn, const GLvoid * return card_offset - rmesa->r200Screen->gart_base; } -#endif GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, GLint size ) diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index 9ad5eb3c09..011288161b 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -106,12 +106,11 @@ extern void r200WaitForIdleLocked( r200ContextPtr rmesa ); extern void r200WaitForVBlank( r200ContextPtr rmesa ); extern void r200InitIoctlFuncs( struct dd_function_table *functions ); -#ifndef _SOLO extern void *r200AllocateMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority ); extern void r200FreeMemoryMESA( __DRInativeDisplay *dpy, int scrn, GLvoid *pointer ); extern GLuint r200GetMemoryOffsetMESA( __DRInativeDisplay *dpy, int scrn, const GLvoid *pointer ); -#endif + extern GLboolean r200IsGartMemory( r200ContextPtr rmesa, const GLvoid *pointer, GLint size ); diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c index 167e93a6ac..9b6557d186 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.c +++ b/src/mesa/drivers/dri/r200/r200_screen.c @@ -50,9 +50,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "utils.h" #include "vblank.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif /* R200 configuration */ @@ -433,7 +431,7 @@ r200CreateScreen( __DRIscreenPrivate *sPriv ) screen->driScreen = sPriv; screen->sarea_priv_offset = dri_priv->sarea_priv_offset; -#ifndef _SOLO + if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -462,7 +460,6 @@ r200CreateScreen( __DRIscreenPrivate *sPriv ) } } } -#endif return screen; } @@ -572,7 +569,6 @@ static const struct __DriverAPIRec r200API = { * */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -580,15 +576,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r200API); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &r200API); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 7fbcbaf196..53bddcf4ab 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -421,15 +421,11 @@ radeonCreateContext( const __GLcontextModes *glVisual, rmesa->vblank_flags = (rmesa->radeonScreen->irq != 0) ? driGetDefaultVBlankFlags(&rmesa->optionCache) : VBLANK_FLAG_NO_IRQ; -#ifndef _SOLO + rmesa->get_ust = (PFNGLXGETUSTPROC) glXGetProcAddress( (const GLubyte *) "__glXGetUST" ); if ( rmesa->get_ust == NULL ) { rmesa->get_ust = get_ust_nop; } -#else - rmesa->get_ust = get_ust_nop; -#endif - (*rmesa->get_ust)( & rmesa->swap_ust ); diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index ae856edb29..a3b2047bc8 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -48,9 +48,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "context.h" #include "vblank.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif /* Radeon configuration */ @@ -367,7 +365,7 @@ radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv ) screen->logTexGranularity[RADEON_GART_TEX_HEAP] = dri_priv->log2GARTTexGran; } -#ifndef _SOLO + if ( driCompareGLXAPIVersion( 20030813 ) >= 0 ) { PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension = (PFNGLXSCRENABLEEXTENSIONPROC) glXGetProcAddress( (const GLubyte *) "__glXScrEnableExtension" ); @@ -389,7 +387,7 @@ radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv ) } } -#endif + screen->driScreen = sPriv; screen->sarea_priv_offset = dri_priv->sarea_priv_offset; return screen; @@ -498,7 +496,6 @@ static struct __DriverAPIRec radeonAPI = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -506,15 +503,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &radeonAPI); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &radeonAPI); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/sis/sis_screen.c b/src/mesa/drivers/dri/sis/sis_screen.c index 986f32040b..aa1cd9b5df 100644 --- a/src/mesa/drivers/dri/sis/sis_screen.c +++ b/src/mesa/drivers/dri/sis/sis_screen.c @@ -41,9 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "xmlpool.h" -#ifndef _SOLO #include "GL/internal/dri_interface.h" -#endif const char __driConfigOptions[] = DRI_CONF_BEGIN @@ -348,7 +346,6 @@ static struct __DriverAPIRec sisAPI = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -356,15 +353,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &sisAPI); return (void *)psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &sisAPI); - return (void *)psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.c b/src/mesa/drivers/dri/tdfx/tdfx_screen.c index 72e8d12677..439030bcd3 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_screen.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.c @@ -420,7 +420,6 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -428,13 +427,4 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &tdfxAPI); return (void *) psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &tdfxAPI); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c index b349a5b63f..a496380c79 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.c +++ b/src/mesa/drivers/dri/unichrome/via_context.c @@ -56,9 +56,6 @@ #include "via_ioctl.h" #include "via_fb.h" -#ifndef _SOLO -#include <X11/Xlibint.h> -#endif #include <stdio.h> #include "macros.h" @@ -482,10 +479,8 @@ viaCreateContext(const __GLcontextModes *mesaVis, _tnl_allow_pixel_fog(ctx, GL_FALSE); _tnl_allow_vertex_fog(ctx, GL_TRUE); -#ifndef _SOLO /* vmesa->display = dpy; */ vmesa->display = sPriv->display; -#endif vmesa->hHWContext = driContextPriv->hHWContext; vmesa->driFd = sPriv->fd; diff --git a/src/mesa/drivers/dri/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h index fe26ff80d3..4ac3a8cfa6 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.h +++ b/src/mesa/drivers/dri/unichrome/via_context.h @@ -32,10 +32,6 @@ typedef struct via_texture_object_t *viaTextureObjectPtr; #include "dri_util.h" -#ifndef _SOLO -#include <X11/Xlibint.h> -#endif - #include "mtypes.h" #include "drm.h" #include "mm.h" @@ -291,9 +287,7 @@ struct via_context_t { drm_context_t hHWContext; drm_hw_lock_t *driHwLock; int driFd; -#ifndef _SOLO - Display *display; -#endif + __DRInativeDisplay *display; __DRIdrawablePrivate *driDrawable; __DRIscreenPrivate *driScreen; diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c index b0d4c57ec0..242348a953 100644 --- a/src/mesa/drivers/dri/unichrome/via_screen.c +++ b/src/mesa/drivers/dri/unichrome/via_screen.c @@ -291,7 +291,6 @@ static struct __DriverAPIRec viaAPI = { * Return: pointer to a __DRIscreenPrivate. */ #if !defined(DRI_NEW_INTERFACE_ONLY) -#ifndef _SOLO void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, int numConfigs, __GLXvisualConfig *config) { @@ -299,15 +298,6 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &viaAPI); return (void *)psp; } -#else -void *__driCreateScreen(struct DRIDriverRec *driver, - struct DRIDriverContextRec *driverContext) -{ - __DRIscreenPrivate *psp; - psp = __driUtilCreateScreen(driver, driverContext, &viaAPI); - return (void *) psp; -} -#endif #endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ |