intel: Fix crash in intel_flush().
authorMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:08:11 +0000 (10:08 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Mon, 21 Sep 2009 08:28:37 +0000 (10:28 +0200)
Since commit 2921a2555d0a76fa649b23c31e3264bbc78b2ff5 ('intel: Deassociated
drawables from private context struct in intelUnbindContext'),
intel->driDrawable may be NULL in intel_flush().

src/mesa/drivers/dri/intel/intel_context.c

index 7fa70e428d06a1dfc7256531f488bce572465e67..e593b236a795763309eea3da0db55da756bf9eef 100644 (file)
@@ -500,7 +500,8 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
 
       if (screen->dri2.loader &&
           (screen->dri2.loader->base.version >= 2)
-         && (screen->dri2.loader->flushFrontBuffer != NULL)) {
+         && (screen->dri2.loader->flushFrontBuffer != NULL) &&
+          intel->driDrawable && intel->driDrawable->loaderPrivate) {
         (*screen->dri2.loader->flushFrontBuffer)(intel->driDrawable,
                                                  intel->driDrawable->loaderPrivate);