Henri Verbeet : wined3d: End active queries before restarting them in wined3d_query_vk_issue().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Mar 11 13:54:34 2021 +0100

wined3d: End active queries before restarting them in wined3d_query_vk_issue().

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

---

 dlls/wined3d/query.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index b239ee895f6..1ef83891ddf 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -1636,6 +1636,11 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags)
             wined3d_context_vk_remove_pending_queries(context_vk, query_vk);
         memset((void *)query->data, 0, query->data_size);
         vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk);
+        if (query_vk->started)
+        {
+            wined3d_query_vk_end(query_vk, context_vk, vk_command_buffer);
+            list_remove(&query_vk->entry);
+        }
         wined3d_query_vk_begin(query_vk, context_vk, vk_command_buffer);
         list_add_head(&context_vk->active_queries, &query_vk->entry);
         query_vk->started = true;