wined3d: Use glGetQueryObjectui64v() for occlusion queries when available.

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: Use glGetQueryObjectui64v() for occlusion queries when available.
6fbb93a3 · Józef Kucia · Alexandre Julliard · d3c58df4 · 6fbb93a3
Commit 6fbb93a3 authored Nov 21, 2016 by Józef Kucia Committed by Alexandre Julliard Nov 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

query.c dlls/wined3d/query.c +14 -4

No files found.
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -386,10 +386,20 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query)

    if (available)
    {
-        GLuint result;
-        GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result));
-        checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)");
-        oq->samples = result;
+        if (gl_info->supported[ARB_TIMER_QUERY])
+        {
+            GLuint64 result;
+            GL_EXTCALL(glGetQueryObjectui64v(oq->id, GL_QUERY_RESULT, &result));
+            checkGLcall("glGetQueryObjectui64v(GL_QUERY_RESULT)");
+            oq->samples = result;
+        }
+        else
+        {
+            GLuint result;
+            GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result));
+            checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)");
+            oq->samples = result;
+        }
        TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples));
    }