wined3d: Get rid of redundant ARB_timer_query checks.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Get rid of redundant ARB_timer_query checks.
be2908ed · Henri Verbeet · Alexandre Julliard · 0b933f1f · be2908ed
Commit be2908ed authored Jul 22, 2016 by Henri Verbeet Committed by Alexandre Julliard Jul 22, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 12 deletions

query.c dlls/wined3d/query.c +3 -12

No files found.
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -588,16 +588,13 @@ 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])
-    {
-        struct wined3d_timestamp_query *tq = query->extendedData;
-        struct wined3d_context *context;
-
    if (flags & WINED3DISSUE_BEGIN)
    {
        WARN("Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.\n");
@@ -611,15 +608,9 @@ static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DW
        GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP));
        checkGLcall("glQueryCounter()");
        context_release(context);
-        }
-    }
-    else
-    {
-        ERR("Timestamp queries not supported.\n");
-    }

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

    return WINED3D_OK;
 }