diff options
| author | Jon Smirl <jonsmirl@gmail.com> | 2004-06-02 22:45:00 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@gmail.com> | 2004-06-02 22:45:00 +0000 |
| commit | ffb36d57a5f6359b5b91b73af60482a0016dd431 (patch) | |
| tree | 5b9ba0f257974b5a28a220a57d8d49c2dfe2d8f7 /src/mesa/drivers/dri/common | |
| parent | 1960182ece3f1eca06d2e439f64dd61be8a03ff5 (diff) | |
Removed need for sarea.h, various touch ups to get rid of type mismatches.
Diffstat (limited to 'src/mesa/drivers/dri/common')
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 6 |
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 05bfce8f53..f60c772c78 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -40,7 +40,7 @@ #ifndef DRI_NEW_INTERFACE_ONLY # include "xf86dri.h" #endif /* DRI_NEW_INTERFACE_ONLY */ -#include "sarea.h" +#include "drm_sarea.h" #include "glcontextmodes.h" #ifndef GLX_OML_sync_control @@ -316,7 +316,7 @@ static void __driGarbageCollectDrawables(void *drawHash) * While casting the opaque private pointers associated with the parameters * into their respective real types it also assures they are not \c NULL. */ -static Bool driUnbindContext3(__DRInativeDisplay *dpy, int scrn, +static GLboolean driUnbindContext3(__DRInativeDisplay *dpy, int scrn, __DRIid draw, __DRIid read, __DRIcontext *ctx) { @@ -498,7 +498,7 @@ static Bool DoBindContext(__DRInativeDisplay *dpy, * for \c glXMakeCurrentReadSGI or GLX 1.3's \c glXMakeContextCurrent * function. */ -static Bool driBindContext3(__DRInativeDisplay *dpy, int scrn, +static GLboolean driBindContext3(__DRInativeDisplay *dpy, int scrn, __DRIid draw, __DRIid read, __DRIcontext * ctx) { @@ -1167,7 +1167,7 @@ __driUtilCreateNewScreen(__DRInativeDisplay *dpy, int scrn, __DRIscreen *psc, const __DRIversion * dri_version, const __DRIversion * drm_version, const __DRIframebuffer * frame_buffer, - drmAddress pSAREA, + drm_sarea_t *pSAREA, int fd, int internal_api_version, const struct __DriverAPIRec *driverAPI) diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 7db6751301..cd338efd79 100644 --- a/src/mesa/drivers/dri/common/dri_util.h +++ b/src/mesa/drivers/dri/common/dri_util.h @@ -56,7 +56,7 @@ #include <inttypes.h> #include "glxclient.h" /* for GLXDrawable */ #include "drm.h" /* for drm_clip_rect_t */ -#include "sarea.h" /* for XF86DRISAREAPtr */ +#include "drm_sarea.h" /* for XF86DRISAREAPtr */ #include "GL/internal/glcore.h" /* for __GLcontextModes */ /* This is a temporary relic. Once all drivers are converted to support @@ -481,7 +481,7 @@ struct __DRIscreenPrivateRec { * - the device lock * - the device-independent per-drawable and per-context(?) information */ - XF86DRISAREAPtr pSAREA; + drm_sarea_t *pSAREA; /** * \name Direct frame buffer access information @@ -563,7 +563,7 @@ extern __DRIscreenPrivate * __driUtilCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc, __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, + drm_sarea_t *pSAREA, int fd, int internal_api_version, const struct __DriverAPIRec *driverAPI ); #ifndef DRI_NEW_INTERFACE_ONLY |