KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ian Romanick 2005-07-24 07:38:23 +00:00
parent c39bf5e273
commit e9dbe58b8b
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/GL/internal/dri_interface.h
View File

@ -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;
/**

5
src/glx/x11/dri_glx.c
View File

@ -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;

13
src/glx/x11/glxclient.h
View File

@ -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;
};

2
src/glx/x11/glxext.c
View File

@ -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