Mesa (master): DRI2: check for swapAvailable before using swap interval protocol
Jesse Barnes
jbarnes at kemper.freedesktop.org
Mon Apr 19 21:21:06 UTC 2010
Module: Mesa
Branch: master
Commit: 0a18cdb0ed2f4b747688f653d9947d174fae77ff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a18cdb0ed2f4b747688f653d9947d174fae77ff
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Mon Apr 19 14:19:48 2010 -0700
DRI2: check for swapAvailable before using swap interval protocol
This should have been part of the last change...
---
src/glx/dri2_glx.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index d09d614..3a53ce9 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -175,6 +175,8 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
{
__GLXDRIdrawablePrivate *pdraw;
__GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) modes;
+ __GLXdisplayPrivate *dpyPriv;
+ __GLXDRIdisplayPrivate *pdp;
pdraw = Xmalloc(sizeof(*pdraw));
if (!pdraw)
@@ -189,6 +191,8 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
DRI2CreateDrawable(psc->dpy, xDrawable);
+ dpyPriv = __glXInitialize(psc->dpy);
+ pdp = (__GLXDRIdisplayPrivate *)dpyPriv->dri2Display;;
/* Create a new drawable */
pdraw->base.driDrawable =
(*psc->dri2->createNewDrawable) (psc->__driScreen,
@@ -204,7 +208,9 @@ dri2CreateDrawable(__GLXscreenConfigs * psc,
* Make sure server has the same swap interval we do for the new
* drawable.
*/
- DRI2SwapInterval(psc->dpy, xDrawable, pdraw->swap_interval);
+ if (pdp->swapAvailable)
+ DRI2SwapInterval(psc->dpy, xDrawable, pdraw->swap_interval);
+
return &pdraw->base;
}
More information about the mesa-commit
mailing list