summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i915
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@gmail.com>2004-07-04 20:33:48 +0000
committerJon Smirl <jonsmirl@gmail.com>2004-07-04 20:33:48 +0000
commitaaebfc88c08c79cd70f1e0d1d262a25e9ded47d1 (patch)
tree9c1aa0013c88e370457ea47aea3e8baccec87c52 /src/mesa/drivers/dri/i915
parent2371033bbaf6e7477bfa893654a0467a084f335b (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/i915')
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c12
1 files changed, 0 insertions, 12 deletions
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) */