Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.

Many DRI entry points took a __DRInativeDisplay pointer and a screen
index as arguments.  The only use for the native display pointer was to
pass it back to the loader when looking up the __DRIscreen for the given
screen index.

Instead, let's just pass in the __DRIscreen pointer directly, which
let's drop the __DRInativeDisplay type and the getScreen function.

The assumption is now that the loader will be able to retrieve context
from the __DRIscreen pointer when necessary.

1 files changed, 12 insertions, 12 deletions

diff --git a/src/mesa/drivers/dri/trident/trident_context.c b/src/mesa/drivers/dri/trident/trident_context.c
index 8dc7f0dc78..1d2a49e6f4 100644
--- a/src/mesa/drivers/dri/trident/trident_context.c
+++ b/src/mesa/drivers/dri/trident/trident_context.c
@@ -430,17 +430,17 @@ static struct __DriverAPIRec tridentAPI = {
 };
 
 
-PUBLIC void *__driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn,
-                                   __DRIscreen *psc,
-                                   const __GLcontextModes * modes,
-                                   const __DRIversion * ddx_version,
-                                   const __DRIversion * dri_version,
-                                   const __DRIversion * drm_version,
-                                   const __DRIframebuffer * frame_buffer,
-                                   drmAddress pSAREA, int fd,
-                                   int internal_api_version,
-				   const __DRIinterfaceMethods * interface,
-                                   __GLcontextModes ** driver_modes )
+PUBLIC void *
+__DRI_CREATE_NEW_SCREEN(int scrn, __DRIscreen *psc,
+			const __GLcontextModes * modes,
+			const __DRIversion * ddx_version,
+			const __DRIversion * dri_version,
+			const __DRIversion * drm_version,
+			const __DRIframebuffer * frame_buffer,
+			drmAddress pSAREA, int fd,
+			int internal_api_version,
+			const __DRIinterfaceMethods * interface,
+			__GLcontextModes ** driver_modes)
 {
     __DRIscreenPrivate *psp;
    static const __DRIversion ddx_expected = { 4, 0, 0 };
@@ -456,7 +456,7 @@ PUBLIC void *__driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn,
       return NULL;
    }
 
-    psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
+    psp = __driUtilCreateNewScreen(scrn, psc, NULL,
                                    ddx_version, dri_version, drm_version,
                                    frame_buffer, pSAREA, fd,
                                    internal_api_version, &tridentAPI);