From 60b0e12830310e7c05b4043857ed277b28b1c781 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 1 Jun 2004 20:24:59 +0000 Subject: Convert 'Display *' to '__DRInativeDisplay *'. Only portions of the interface that are not *strictly* part of the old interface were changed. Replace GetDrawableInfo type (dri_util.h) with PFNGLXGETDRAWABLEINFOPROC (dri_interface.h). Wrap __driCreateScreen (in drivers that use the new interface) with '#ifndef DRI_NEW_INTERFACE_ONLY'. --- src/mesa/drivers/dri/i830/i830_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/i830') diff --git a/src/mesa/drivers/dri/i830/i830_screen.c b/src/mesa/drivers/dri/i830/i830_screen.c index 1a40c79a013..4314b2160f2 100644 --- a/src/mesa/drivers/dri/i830/i830_screen.c +++ b/src/mesa/drivers/dri/i830/i830_screen.c @@ -392,7 +392,7 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &i830API); return (void *) psp; } -#else +#elif !defined(DRI_NEW_INTERFACE_ONLY) void *__driCreateScreen(struct DRIDriverRec *driver, struct DRIDriverContextRec *driverContext) { @@ -551,7 +551,7 @@ i830FillInModes( unsigned pixel_bits, unsigned depth_bits, * failure. */ #ifdef USE_NEW_INTERFACE -void * __driCreateNewScreen( Display *dpy, int scrn, __DRIscreen *psc, +void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc, const __GLcontextModes * modes, const __DRIversion * ddx_version, const __DRIversion * dri_version, -- cgit v1.2.3