Stop passing in unused fbconfigs to createNewScreen.

diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index 178134270d14626a0a1f5d5ff4c4ef95c5c81a26..aa2b1cf8057b9781e2ebdcc681c785793f6a36d9 100644 (file)
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -115,7 +115,6 @@ typedef void (* PFNGLXSCRENABLEEXTENSIONPROC) (__DRIscreen *screen,
 #define __DRI_INTERFACE_VERSION 20070105
 
 typedef void *(CREATENEWSCREENFUNC)(int scr, __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,

diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 8c12ae254ad78f735d2bfa5da60496e7b2af17e4..ee8e238bec52c86e67ca9ecb899d7c8991053b63 100644 (file)
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -957,7 +957,6 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
                                    err_extra = NULL;
                                    psp = (*createNewScreen)(scrn,
                                                             &psc->driScreen,
-                                                            psc->configs,
                                                             & ddx_version,
                                                             & dri_version,
                                                             & drm_version,
@@ -968,8 +967,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
                                                             & interface_methods,
                                                             & driver_modes );
 
-                                   filter_modes( & psc->configs,
-                                                 driver_modes );
+                                   filter_modes(&psc->configs, driver_modes);
                                    _gl_context_modes_destroy( driver_modes );
                                }
                            }

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 9c96392654fbbbe97240ddd5b9b909984dbd2aac..84a6d819def48d7622e52c411dd8c28a1f89b582 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -657,9 +657,6 @@ static void driDestroyScreen(__DRIscreen *screen)
        (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
        (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);
        (void)drmCloseOnce(psp->fd);
-       if ( psp->modes != NULL ) {
-           (*dri_interface->destroyContextModes)( psp->modes );
-       }
 
        _mesa_free(psp);
     }
@@ -699,7 +696,6 @@ static void driDestroyScreen(__DRIscreen *screen)
  */
 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,
@@ -720,7 +716,6 @@ void * __DRI_CREATE_NEW_SCREEN( int scrn, __DRIscreen *psc,
        return NULL;
 
     psp->psc = psc;
-    psp->modes = NULL;
 
     /*
     ** NOT_DONE: This is used by the X server to detect when the client

diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index f56f1fa96ac873d15d1ee8c0121a6e44b27fe7ac..5ac2eea72215428e70b62025c191fb025b494b69 100644 (file)
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -458,17 +458,6 @@ struct __DRIscreenPrivateRec {
      */
     void *private;
 
-    /**
-     * GLX visuals / FBConfigs for this screen.  These are stored as a
-     * linked list.
-     * 
-     * \note
-     * This field is \b only used in conjunction with the old interfaces.  If
-     * the new interfaces are used, this field will be set to \c NULL and will
-     * not be dereferenced.
-     */
-    __GLcontextModes *modes;
-
     /**
      * Pointer back to the \c __DRIscreen that contains this structure.
      */