wined3d: Simplify logic in wined3d_event_query_issue().

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Simplify logic in wined3d_event_query_issue().
1d27b69f · Józef Kucia · Alexandre Julliard · 8b9ece67 · 1d27b69f
Commit 1d27b69f authored Apr 05, 2017 by Józef Kucia Committed by Alexandre Julliard Apr 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 17 deletions

query.c dlls/wined3d/query.c +7 -17

No files found.
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -214,27 +214,17 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_
 void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device)
 {
+    struct wined3d_context *context = NULL;
    const struct wined3d_gl_info *gl_info;
-    struct wined3d_context *context;
-    if (query->context)
+    if (query->context && !(context = context_reacquire(device, query->context))
-    {
+            && !query->context->gl_info->supported[ARB_SYNC])
-        if (!(context = context_reacquire(device, query->context))
+        context_free_event_query(query);
-                && !query->context->gl_info->supported[ARB_SYNC])
+    if (!context)
-        {
-            context_free_event_query(query);
-            context = context_acquire(device, NULL, 0);
-            context_alloc_event_query(context, query);
-        }
-        if (!context)
-            context = context_acquire(device, NULL, 0);
-    }
-    else
-    {
        context = context_acquire(device, NULL, 0);
-        context_alloc_event_query(context, query);
-    }
    gl_info = context->gl_info;
+    if (!query->context)
+        context_alloc_event_query(context, query);
    if (gl_info->supported[ARB_SYNC])
    {