Gut a few more dead bits. Replace uses of the CreateNewScreenFunc typedef

(from glxclient.h) with PFNCREATENEWSCREEN (from dri_interface.h).

Remove the prototype for __driCreateScreen and fix the prototype for
__driCreateNewScreen (append the API version) in dri_interface.h.

4 files changed, 7 insertions, 22 deletions

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 3a704f6a72e..e5c5a7759d1 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -175,14 +175,7 @@ typedef void *(CREATENEWSCREENFUNC)(__DRInativeDisplay *dpy, int scrn,
     void * pSAREA, int fd, int internal_api_version,
     __GLcontextModes ** driver_modes);
 typedef CREATENEWSCREENFUNC* PFNCREATENEWSCREENFUNC;
-extern CREATENEWSCREENFUNC __driCreateNewScreen;
-
-#ifndef DRI_NEW_INTERFACE_ONLY
-
-extern void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
-    int numConfigs, __GLXvisualConfig *config);
-
-#endif /* DRI_NEW_INTERFACE_ONLY */
+extern CREATENEWSCREENFUNC __driCreateNewScreen_20050722;
 
 
 /**
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index a4a389ce5d8..8cc0b62b023 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -237,7 +237,7 @@ static __DRIdriver *OpenDriver(const char *driverName)
             return NULL; /* out of memory! */
          }
 
-         driver->createNewScreenFunc = (CreateNewScreenFunc)
+         driver->createNewScreenFunc = (PFNCREATENEWSCREENFUNC)
             dlsym(handle, createNewScreenName);
 
          if ( driver->createNewScreenFunc == NULL ) {
@@ -424,7 +424,8 @@ void *driCreateDisplay(Display *dpy, __DRIdisplay *pdisp)
     pdisp->destroyDisplay = driDestroyDisplay;
 
     /* allocate array of pointers to createNewScreen funcs */
-    pdisp->createNewScreen = (CreateNewScreenFunc *) Xmalloc(numScreens * sizeof(void *));
+    pdisp->createNewScreen = (PFNCREATENEWSCREENFUNC *)
+      Xmalloc(numScreens * sizeof(void *));
     if (!pdisp->createNewScreen) {
        Xfree(pdpyp);
        return NULL;
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h
index b8241b8cf23..6852fd066aa 100644
--- a/src/glx/x11/glxclient.h
+++ b/src/glx/x11/glxclient.h
@@ -84,15 +84,6 @@ typedef struct _glapi_table __GLapi;
 
 #include <GL/internal/dri_interface.h>
 
-typedef void *(*CreateScreenFunc)(Display *dpy, int scrn, __DRIscreen *psc,
-                                  int numConfigs, __GLXvisualConfig *config);
-
-typedef void *(*CreateNewScreenFunc)(Display *dpy, int scrn, __DRIscreen *psc,
-    const __GLcontextModes * modes, const __DRIversion * ddx_version,
-    const __DRIversion * dri_version, const __DRIversion * drm_version,
-    const __DRIframebuffer * frame_buffer, void * pSAREA,
-    int fd, int internal_api_version, __GLcontextModes ** driver_modes);
-
 
 /**
  * Display dependent methods.  This structure is initialized during the
@@ -114,7 +105,7 @@ struct __DRIdisplayRec {
      * Array of pointers to methods to create and initialize the private DRI
      * screen data.
      */
-    CreateNewScreenFunc * createNewScreen;
+    PFNCREATENEWSCREENFUNC * createNewScreen;
 };
 
 
@@ -124,7 +115,7 @@ struct __DRIdisplayRec {
 struct __DRIdriverRec {
    const char *name;
    void *handle;
-   CreateNewScreenFunc createNewScreenFunc;
+   PFNCREATENEWSCREENFUNC createNewScreenFunc;
    struct __DRIdriverRec *next;
 };
 
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index be6b84b262d..1754efa0c26 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -688,7 +688,7 @@ filter_modes( __GLcontextModes ** server_modes,
 static void *
 CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
 		    __DRIdisplay * driDpy,
-		    CreateNewScreenFunc createNewScreen)
+		    PFNCREATENEWSCREENFUNC createNewScreen)
 {
     __DRIscreenPrivate *psp = NULL;
 #ifndef GLX_USE_APPLEGL