From 8cab54de16f4691672533967daa79c9cfa2e24cc Mon Sep 17 00:00:00 2001 From: Mario Kleiner Date: Fri, 5 Dec 2014 08:42:29 +0100 Subject: glx/dri3: Fix glXWaitForSbcOML() to handle targetSBC==0 correctly. (v2) targetSBC == 0 is a special case, which asks the function to block until all pending OpenGL bufferswap requests have completed. Currently the function just falls through for targetSBC == 0, returning bogus results. This breaks applications originally written and tested against DRI2 which also rely on this not regressing under DRI3/Present, e.g., Neuro-Science software like Psychtoolbox-3. This patch fixes the problem. v2: Simplify as suggested by Axel Davy. Add comments proposed by Eric Anholt. Cc: "10.3 10.4" Signed-off-by: Mario Kleiner Reviewed-by: Axel Davy Reviewed-by: Eric Anholt --- src/glx/dri3_glx.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src') diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index a9ff73b36f4..15d874d660f 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -529,6 +529,15 @@ dri3_wait_for_sbc(__GLXDRIdrawable *pdraw, int64_t target_sbc, int64_t *ust, { struct dri3_drawable *priv = (struct dri3_drawable *) pdraw; + /* From the GLX_OML_sync_control spec: + * + * "If = 0, the function will block until all previous + * swaps requested with glXSwapBuffersMscOML for that window have + * completed." + */ + if (!target_sbc) + target_sbc = priv->send_sbc; + while (priv->recv_sbc < target_sbc) { if (!dri3_wait_for_event(pdraw)) return 0; -- cgit v1.2.3