Henri Verbeet : wined3d: Use the context' s gl_info in wined3d_timestamp_query_ops_issue().

Alexandre Julliard julliard at winehq.org
Fri Jul 29 10:17:08 CDT 2016


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jul 29 12:34:33 2016 +0200

wined3d: Use the context's gl_info in wined3d_timestamp_query_ops_issue().

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

---

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

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 55e63e9..9843558 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -567,8 +567,7 @@ static BOOL wined3d_timestamp_query_ops_poll(struct wined3d_query *query)
 static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags)
 {
     struct wined3d_timestamp_query *tq = wined3d_timestamp_query_from_query(query);
-    struct wined3d_device *device = query->device;
-    const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+    const struct wined3d_gl_info *gl_info;
     struct wined3d_context *context;
 
     TRACE("query %p, flags %#x.\n", query, flags);
@@ -582,6 +581,7 @@ static void wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD
         if (tq->context)
             context_free_timestamp_query(tq);
         context = context_acquire(query->device, NULL);
+        gl_info = context->gl_info;
         context_alloc_timestamp_query(context, tq);
         GL_EXTCALL(glQueryCounter(tq->id, GL_TIMESTAMP));
         checkGLcall("glQueryCounter()");




More information about the wine-cvs mailing list