Stop passing in unused fbconfigs to createNewScreen.
This commit is contained in:

committed by
Kristian Høgsberg

parent
64106d0d9a
commit
295dc2d225
@@ -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,
|
||||
|
@@ -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 );
|
||||
}
|
||||
}
|
||||
|
@@ -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
|
||||
|
@@ -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.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user