Fix a couple issues related to GetDrawableInfo. In the new DRI

interface, it must be available from libGL, and the the typedef in
dri_util.h was wrong.
This commit is contained in:
Ian Romanick 2004-06-01 19:20:12 +00:00
parent 0521ab46c1
commit ec032cb17b
2 changed files with 8 additions and 2 deletions

View file

@ -826,7 +826,13 @@ static void *driCreateNewDrawable(Display *dpy,
pdp->getInfo = (GetDrawableInfo *)
glXGetProcAddress( (const GLubyte *) "__glXGetDrawableInfo" );
if ( pdp->getInfo == NULL ) {
#ifdef DRI_NEW_INTERFACE_ONLY
(void)XF86DRIDestroyDrawable(dpy, modes->screen, pdp->draw);
Xfree(pdp);
return NULL;
#else
pdp->getInfo = XF86DRIGetDrawableInfo;
#endif /* DRI_NEW_INTERFACE_ONLY */
}
if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, modes,

View file

@ -257,9 +257,9 @@ struct __DRIswapInfoRec {
typedef Bool (GetDrawableInfo)( Display *dpy, int scrn, __DRIid draw,
unsigned int * index, unsigned int * stamp,
int * x, int * y, int * width, int * height,
int * numClipRects, drm_clip_rect_t * pClipRects,
int * numClipRects, drm_clip_rect_t ** pClipRects,
int * backX, int * backY,
int * numBackClipRects, drm_clip_rect_t * pBackClipRects );
int * numBackClipRects, drm_clip_rect_t ** pBackClipRects );
/**