diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-07-04 20:33:48 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-07-04 20:33:48 +0000 |
| commit | aaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 (patch) | |
| tree | 9c1aa0013c88e370457ea47aea3e8baccec87c52 /src/mesa/drivers/dri/radeon | |
| 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/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 16 |
2 files changed, 3 insertions, 19 deletions
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) */ /** |