diff options
| author | Jon Smirl <[email protected]> | 2004-07-04 20:33:48 +0000 |
|---|---|---|
| committer | Jon Smirl <[email protected]> | 2004-07-04 20:33:48 +0000 |
| commit | aaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 (patch) | |
| tree | 9c1aa0013c88e370457ea47aea3e8baccec87c52 /src/mesa/drivers/dri/mach64 | |
| parent | 2371033bbaf6e7477bfa893654a0467a084f335b (diff) | |
Patch removes _SOLO definition needed for mesa-solo. mesa-solo
uses the NEW_INTERFACE now so _SOLO isn't necessary anymore.
Tested with the hardware that I own.
Diffstat (limited to 'src/mesa/drivers/dri/mach64')
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_screen.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index 0d717da51b6..a6cb8b95db3 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) */ /** |