diff options
| author | Jon Smirl <[email protected]> | 2004-06-26 17:16:42 +0000 |
|---|---|---|
| committer | Jon Smirl <[email protected]> | 2004-06-26 17:16:42 +0000 |
| commit | c2bffec91a5b6ba72514c875b70dbc96ac97431d (patch) | |
| tree | 3c5f963b8cec93217b18cdec35c50f0c45b3339e /include/GL | |
| parent | e16f6e3f234391027b300ec2ca8b56fc13aac825 (diff) | |
Mesa-solo builds with these changes. There are still more fixups needed to
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/internal/dri_interface.h | 13 | ||||
| -rw-r--r-- | include/GL/miniglx.h | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index 079ff106baf..ced714d43e0 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -165,11 +165,14 @@ extern GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, */ /*@{*/ -extern void * __driCreateNewScreen( __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, __GLcontextModes ** driver_modes ); +typedef void *(CREATENEWSCREENFUNC)(__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, + void * pSAREA, int fd, int internal_api_version, + __GLcontextModes ** driver_modes); +typedef CREATENEWSCREENFUNC* PFNCREATENEWSCREENFUNC; +extern CREATENEWSCREENFUNC __driCreateNewScreen; #ifndef DRI_NEW_INTERFACE_ONLY diff --git a/include/GL/miniglx.h b/include/GL/miniglx.h index 41e20936285..1a6304f6ba1 100644 --- a/include/GL/miniglx.h +++ b/include/GL/miniglx.h @@ -420,8 +420,8 @@ glXGetCurrentContext( void ); extern GLXDrawable glXGetCurrentDrawable( void ); -extern const void * -glXGetProcAddress( const GLubyte *procname ); +extern void +(*glXGetProcAddress(const GLubyte *procname))( void ); extern Bool glXQueryVersion( Display *dpy, int *major, int *minor ); |