Mesa (master): intel: Fix crash in intel_flush().
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon Sep 21 08:52:37 UTC 2009
Module: Mesa
Branch: master
Commit: 999592745f40a96a7307da374cab4d68254acf75
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=999592745f40a96a7307da374cab4d68254acf75
Author: Michel Dänzer <daenzer at vmware.com>
Date: Mon Sep 21 10:08:11 2009 +0200
intel: Fix crash in intel_flush().
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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 7fa70e4..e593b23 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -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);
More information about the mesa-commit
mailing list