fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix dumb mistake from a previous commit. __driCreateScreen is now

Browse source 
properly block with '#ifndef DRI_NEW_INTERFACE_ONLY'.
This commit is contained in:
Ian Romanick 2004-06-01 23:14:19 +00:00
parent 7a6eda7137
commit a4436a8f44
7 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i810/i810screen.c
View file

@ -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

4
src/mesa/drivers/dri/i830/i830_screen.c
View file

@ -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

4
src/mesa/drivers/dri/mach64/mach64_screen.c
View file

@ -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

4
src/mesa/drivers/dri/mga/mga_xmesa.c
View file

@ -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) */
/**

4
src/mesa/drivers/dri/r200/r200_screen.c
View file

@ -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) */
/**

4
src/mesa/drivers/dri/radeon/radeon_screen.c
View file

@ -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

4
src/mesa/drivers/dri/tdfx/tdfx_screen.c
View file

@ -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) */