diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-09-21 10:39:20 +0200 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-09-21 10:39:20 +0200 |
| commit | 1d4dbd8d9b00cdba8c4aef4a3994d8763fea0dff (patch) | |
| tree | df00e2ea41965bf19c253935b6ef6ff536ae18b2 /src/mesa | |
| parent | 284a7af274bc148f112bd0ebb40583923ee26b49 (diff) | |
| parent | 999592745f40a96a7307da374cab4d68254acf75 (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | 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 3dffc82445..fce42e9c2d 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -507,7 +507,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); |