diff options
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i810/i810screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i830/i830_screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mach64/mach64_screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mga/mga_xmesa.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_screen.c | 4 |
7 files changed, 21 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c index 8995ec0ba4c..4071b8bcc12 100644 --- a/src/mesa/drivers/dri/i810/i810screen.c +++ b/src/mesa/drivers/dri/i810/i810screen.c @@ -393,6 +393,7 @@ static const struct __DriverAPIRec i810API = { * The __driCreateScreen name is the symbol that libGL.so fetches. * 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) @@ -401,7 +402,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i810API); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -410,6 +411,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** * This is the bootstrap function for the driver. libGL supplies all of the diff --git a/src/mesa/drivers/dri/i830/i830_screen.c b/src/mesa/drivers/dri/i830/i830_screen.c index 4314b2160f2..bedab612a1a 100644 --- a/src/mesa/drivers/dri/i830/i830_screen.c +++ b/src/mesa/drivers/dri/i830/i830_screen.c @@ -384,6 +384,7 @@ static const struct __DriverAPIRec i830API = { * The __driCreateScreen name is the symbol that libGL.so fetches. * 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,7 +393,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i830API); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -401,6 +402,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ #ifdef USE_NEW_INTERFACE diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.c b/src/mesa/drivers/dri/mach64/mach64_screen.c index f5c35e49273..11513446c96 100644 --- a/src/mesa/drivers/dri/mach64/mach64_screen.c +++ b/src/mesa/drivers/dri/mach64/mach64_screen.c @@ -497,6 +497,7 @@ static struct __DriverAPIRec mach64API = { * The __driCreateScreen name is the symbol that libGL.so fetches. * 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) @@ -505,7 +506,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mach64API); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -514,6 +515,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** * This is the bootstrap function for the driver. libGL supplies all of the diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 40d3b71002d..8aa647a268f 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -923,6 +923,7 @@ static const struct __DriverAPIRec mgaAPI = { * The __driCreateScreen name is the symbol that libGL.so fetches. * 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) @@ -931,7 +932,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &mgaAPI); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -940,6 +941,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c index e634390d219..688c2cad2a8 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.c +++ b/src/mesa/drivers/dri/r200/r200_screen.c @@ -600,6 +600,7 @@ static const struct __DriverAPIRec r200API = { * 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) @@ -608,7 +609,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &r200API); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -617,6 +618,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index d5bb24b2489..a85be20e861 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -557,6 +557,7 @@ static struct __DriverAPIRec radeonAPI = { * The __driCreateScreen name is the symbol that libGL.so fetches. * 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) @@ -565,7 +566,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &radeonAPI); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -574,6 +575,7 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ /** * This is the bootstrap function for the driver. libGL supplies all of the diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.c b/src/mesa/drivers/dri/tdfx/tdfx_screen.c index bc87da9aa0a..b78da2ca8fa 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_screen.c +++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.c @@ -445,6 +445,7 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc * The __driCreateScreen name is the symbol that libGL.so fetches. * 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) @@ -453,7 +454,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &tdfxAPI); return (void *) psp; } -#elif !defined(DRI_NEW_INTERFACE_ONLY) +#else void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -462,3 +463,4 @@ void *__driCreateScreen(struct DRIDriverRec *driver, return (void *) psp; } #endif +#endif /* !defined(DRI_NEW_INTERFACE_ONLY) */ |