Mesa (master): GLX/DRI2: pass X drawable ID instead
Jesse Barnes
jbarnes at kemper.freedesktop.org
Wed Jan 13 23:43:38 UTC 2010
Module: Mesa
Branch: master
Commit: 62eb28c810a192dab772402904c50eea43b8340e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=62eb28c810a192dab772402904c50eea43b8340e
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Wed Jan 13 18:42:55 2010 -0500
GLX/DRI2: pass X drawable ID instead
These happened to be the same in my testing since I was using apps that
depend on the GLX 1.2 behavior where X and GLX drawables are
interchangeable.
---
src/glx/x11/dri2_glx.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 8314906..e1688f3 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -205,14 +205,14 @@ static int
dri2DrawableGetMSC(__GLXscreenConfigs *psc, __GLXDRIdrawable *pdraw,
int64_t *ust, int64_t *msc, int64_t *sbc)
{
- return DRI2GetMSC(psc->dpy, pdraw->drawable, ust, msc, sbc);
+ return DRI2GetMSC(psc->dpy, pdraw->xDrawable, ust, msc, sbc);
}
static int
dri2WaitForMSC(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
int64_t remainder, int64_t *ust, int64_t *msc, int64_t *sbc)
{
- return DRI2WaitMSC(pdraw->psc->dpy, pdraw->drawable, target_msc, divisor,
+ return DRI2WaitMSC(pdraw->psc->dpy, pdraw->xDrawable, target_msc, divisor,
remainder, ust, msc, sbc);
}
@@ -220,7 +220,7 @@ static int
dri2WaitForSBC(__GLXDRIdrawable *pdraw, int64_t target_sbc, int64_t *ust,
int64_t *msc, int64_t *sbc)
{
- return DRI2WaitSBC(pdraw->psc->dpy, pdraw->drawable, target_sbc, ust, msc,
+ return DRI2WaitSBC(pdraw->psc->dpy, pdraw->xDrawable, target_sbc, ust, msc,
sbc);
}
@@ -381,7 +381,7 @@ dri2SwapBuffers(__GLXDRIdrawable *pdraw, int64_t target_msc, int64_t divisor,
return 0;
}
- DRI2SwapBuffers(pdraw->psc->dpy, pdraw->drawable, target_msc, divisor,
+ DRI2SwapBuffers(pdraw->psc->dpy, pdraw->xDrawable, target_msc, divisor,
remainder, &ret);
#if __DRI2_FLUSH_VERSION >= 2
More information about the mesa-commit
mailing list