Mario Kleiner wrote:
> From: kleinerm <mario.klei...@tuebingen.mpg.de>
>
> Signed-off-by: Mario Kleiner <mario.klei...@tuebingen.mpg.de>
> ---
> src/glx/x11/glxcmds.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
> index fefdd99..67518dd 100644
> --- a/src/glx/x11/glxcmds.c
> +++ b/src/glx/x11/glxcmds.c
> @@ -2364,7 +2364,7 @@ __glXGetSyncValuesOML(Display * dpy, GLXDrawable
> drawable,
> psc = &priv->screenConfigs[i];
>
> #if defined(__DRI_SWAP_BUFFER_COUNTER) && defined(__DRI_MEDIA_STREAM_COUNTER)
> - if (pdraw && psc->sbc && psc->sbc)
> + if (pdraw && psc->sbc && psc->msc)
> return ( (pdraw && psc->sbc && psc->msc)
> && ((*psc->msc->getMSC)(psc->driScreen, msc) == 0)
> && ((*psc->sbc->getSBC)(pdraw->driDrawable, sbc) == 0)
> @@ -2487,7 +2487,7 @@ __glXSwapBuffersMscOML(Display * dpy, GLXDrawable
> drawable,
> __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen);
> __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen);
>
> - if (!pdraw || !gc->driContext) /* no GLX for this */
> + if (!pdraw || !gc || !gc->driContext) /* no GLX for this */
> return -1;
>
> /* The OML_sync_control spec says these should "generate a GLX_BAD_VALUE
> @@ -2587,7 +2587,7 @@ __glXWaitForSbcOML(Display * dpy, GLXDrawable drawable,
> return ((ret == 0) && (__glXGetUST(ust) == 0));
> }
> #endif
> - if (pdraw && psc->driScreen && psc->driScreen->waitForMSC) {
> + if (pdraw && psc->driScreen && psc->driScreen->waitForSBC) {
> ret = psc->driScreen->waitForSBC(pdraw, target_sbc, ust, msc, sbc);
> return ret;
> }
Committed. Thanks.
-Brian
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
