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/r200/r200_screen.c | |
| 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/r200/r200_screen.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.c | 15 |
1 files changed, 1 insertions, 14 deletions
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) */ |