apple: ifdef out come glapi-foo on darwin

[mesa.git] / src / glx / dri2_glx.c

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index 2c28bc271500a47e13a945159b2fca76d16d2f34..69b47ae45e2d5716ce74be976d7f3d71363601c6 100644 (file)
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -675,11 +675,16 @@ dri2InvalidateBuffers(Display *dpy, XID drawable)
 {
    __GLXDRIdrawable *pdraw =
       dri2GetGlxDrawableFromXDrawableId(dpy, drawable);
-   struct dri2_screen *psc = (struct dri2_screen *) pdraw->psc;
+   struct dri2_screen *psc;
    struct dri2_drawable *pdp = (struct dri2_drawable *) pdraw;
 
+   if (!pdraw)
+      return;
+
+   psc = (struct dri2_screen *) pdraw->psc;
+
 #if __DRI2_FLUSH_VERSION >= 3
-   if (pdraw && psc->f)
+   if (pdraw && psc->f && psc->f->base.version >= 3 && psc->f->invalidate)
        psc->f->invalidate(pdp->driDrawable);
 #endif
 }
@@ -702,7 +707,8 @@ dri2_bind_tex_image(Display * dpy,
       psc = (struct dri2_screen *) base->psc;
 
 #if __DRI2_FLUSH_VERSION >= 3
-      if (!pdp->invalidateAvailable && psc->f)
+      if (!pdp->invalidateAvailable && psc->f &&
+           psc->f->base.version >= 3 && psc->f->invalidate)
         psc->f->invalidate(pdraw->driDrawable);
 #endif
 
@@ -945,6 +951,9 @@ handle_error:
 static void
 dri2DestroyDisplay(__GLXDRIdisplay * dpy)
 {
+   struct dri2_display *pdp = (struct dri2_display *) dpy;
+
+   __glxHashDestroy(pdp->dri2Hash);
    Xfree(dpy);
 }