Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end ().

Alexandre Julliard julliard at winehq.org
Fri Jul 5 14:49:18 CDT 2019


Module: wine
Branch: master
Commit: 7b13749fc8378f8d2e6ef600d9b54f6bfdab3118
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7b13749fc8378f8d2e6ef600d9b54f6bfdab3118

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Jul  5 16:26:21 2019 +0430

wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end().

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

---

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

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 08f2e82..d6f7879 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -956,9 +956,9 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f
 }
 
 static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query,
-        struct wined3d_context *context)
+        struct wined3d_context_gl *context_gl)
 {
-    const struct wined3d_gl_info *gl_info = context->gl_info;
+    const struct wined3d_gl_info *gl_info = context_gl->c.gl_info;
 
     GL_EXTCALL(glEndQuery(GL_VERTICES_SUBMITTED_ARB));
     GL_EXTCALL(glEndQuery(GL_PRIMITIVES_SUBMITTED_ARB));
@@ -990,7 +990,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
         {
             if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl)))
             {
-                wined3d_pipeline_statistics_query_end(pq, &context_gl->c);
+                wined3d_pipeline_statistics_query_end(pq, context_gl);
             }
             else
             {
@@ -1031,7 +1031,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
         {
             if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl)))
             {
-                wined3d_pipeline_statistics_query_end(pq, &context_gl->c);
+                wined3d_pipeline_statistics_query_end(pq, context_gl);
                 context_release(&context_gl->c);
                 poll = TRUE;
             }




More information about the wine-cvs mailing list