diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-04-19 14:20:58 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-04-19 14:20:58 -0700 |
| commit | 35489ef285f1fde234b2b9bbb91fdc41fddefc02 (patch) | |
| tree | 5f339353a797e01d32d00fb684730d86538d6f12 /src | |
| parent | 7dfde3aadc7f776abf828e4c45dbce2177564a53 (diff) | |
| parent | 0a18cdb0ed2f4b747688f653d9947d174fae77ff (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src')
| -rw-r--r-- | 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 d09d614741..3a53ce91b3 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; } |