diff options
| author | Mario Kleiner <mario.kleiner.de@gmail.com> | 2014-12-05 08:42:29 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-12-14 15:09:49 +0000 |
| commit | 8cab54de16f4691672533967daa79c9cfa2e24cc (patch) | |
| tree | b283ce147c049a4594b7951df6eeac71db46f3c4 | |
| parent | ac0940224b7ce154f9492f07ef8c1df036a0b57b (diff) | |
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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | src/glx/dri3_glx.c | 9 |
1 files changed, 9 insertions, 0 deletions
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 <target_sbc> = 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; |