Henri Verbeet : wined3d: Use a slightly shorter timeout in wined3d_event_query_finish().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 54976a033b85f5ad37813dd739ea8ec990e410f8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=54976a033b85f5ad37813dd739...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Aug 20 08:12:08 2012 +0200

wined3d: Use a slightly shorter timeout in wined3d_event_query_finish().

---

 dlls/wined3d/query.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 4a3d7a7..2ee14a3 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -141,7 +141,10 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_
     ENTER_GL();
     if (gl_info->supported[ARB_SYNC])
     {
-        GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, 0, ~(GLuint64)0));
+        /* Apple seems to be into arbitrary limits, and timeouts larger than
+         * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't
+         * really care and can live with waiting a few μs less. (OS X 10.7.4). */
+        GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff));
         checkGLcall("glClientWaitSync");
 
         switch (gl_ret)