diff options
| author | Ian Romanick <[email protected]> | 2004-06-02 05:07:10 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2004-06-02 05:07:10 +0000 |
| commit | c06b25594e5effe34a90c067e1a3da0f61cf2b13 (patch) | |
| tree | b4566acb6bdd7aa99e92c064c38db907a6c9b182 /src/mesa/drivers/dri/common | |
| parent | d203091d204ea2e543cd41ea85d0fc57aa794a4b (diff) | |
Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with
drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.
Diffstat (limited to 'src/mesa/drivers/dri/common')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 4dbd57ae86c..6b251c1cd6b 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -62,7 +62,7 @@ static const int empty_attribute_list[1] = { None }; static PFNGLXWINDOWEXISTSPROC window_exists; typedef Bool (*PFNGLXCREATECONTEXTWITHCONFIGPROC)( __DRInativeDisplay*, int, int, void *, - drmContextPtr ); + drm_context_t * ); static PFNGLXCREATECONTEXTWITHCONFIGPROC create_context_with_config; @@ -167,7 +167,7 @@ findConfigMode(__DRInativeDisplay *dpy, int scrn, VisualID vid, */ static Bool fake_XF86DRICreateContextWithConfig( __DRInativeDisplay* dpy, int screen, int configID, - XID* context, drmContextPtr hHWContext ) + XID* context, drm_context_t * hHWContext ) { Visual vis; @@ -1329,7 +1329,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, { int directCapable; __DRIscreenPrivate *psp = NULL; - drmHandle hSAREA; + drm_handle_t hSAREA; drmAddress pSAREA; char *BusID; __GLcontextModes *modes; @@ -1380,7 +1380,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, err_extra = strerror( -fd ); if (fd >= 0) { - drmMagic magic; + drm_magic_t magic; err_msg = "drmGetMagic"; err_extra = NULL; @@ -1426,7 +1426,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, &dri_version.major, &dri_version.minor, &dri_version.patch)) { - drmHandle hFB; + drm_handle_t hFB; int junk; /* diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 1cc5f7cc546..a36e94be835 100644 --- a/src/mesa/drivers/dri/common/dri_util.h +++ b/src/mesa/drivers/dri/common/dri_util.h @@ -261,7 +261,7 @@ struct __DRIdrawablePrivateRec { /** * Kernel drawable handle */ - drmDrawable hHWDrawable; + drm_drawable_t hHWDrawable; /** * Driver's private drawable information. @@ -377,7 +377,7 @@ struct __DRIcontextPrivateRec { /** * Kernel context handle used to access the device lock. */ - drmContext hHWContext; + drm_context_t hHWContext; /** * Device driver's private context data. This structure is opaque. |