Henri Verbeet : wined3d: Get rid of redundant ARB_timer_query checks.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Fri Jul 22 00:43:47 2016 +0200

wined3d: Get rid of redundant ARB_timer_query checks.

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/query.c | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 369951d..6b3a990 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -588,38 +588,29 @@ static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query,

static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags)
 {
+    struct wined3d_timestamp_query *tq = query->extendedData;
     struct wined3d_device *device = query->device;
     const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+    struct wined3d_context *context;

TRACE("query %p, flags %#x.\n", query, flags);

-    if (gl_info->supported[ARB_TIMER_QUERY])
+    if (flags & WINED3DISSUE_BEGIN)
     {
-        struct wined3d_timestamp_query *tq = query->extendedData;
-        struct wined3d_context *context;
-
-        if (flags & WINED3DISSUE_BEGIN)
-        {
-            WARN("Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.\n");
-        }
-        if (flags & WINED3DISSUE_END)
-        {
-            if (tq->context)
-                context_free_timestamp_query(tq);
-            context = context_acquire(query->device, NULL);
-            context_alloc_timestamp_query(context, tq);
-            GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP));
-            checkGLcall("glQueryCounter()");
-            context_release(context);
-        }
+        WARN("Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.\n");
     }
-    else
+    if (flags & WINED3DISSUE_END)
     {
-        ERR("Timestamp queries not supported.\n");
-    }
+        if (tq->context)
+            context_free_timestamp_query(tq);
+        context = context_acquire(query->device, NULL);
+        context_alloc_timestamp_query(context, tq);
+        GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP));
+        checkGLcall("glQueryCounter()");
+        context_release(context);

-    if (flags & WINED3DISSUE_END)
         query->state = QUERY_SIGNALLED;
+    }

return WINED3D_OK;
 }