[PATCH 1/2] wined3d: Do not accumulate ended queries in wined3d_query_vk_poll().

Henri Verbeet hverbeet at codeweavers.com
Wed Sep 23 08:51:59 CDT 2020


Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 dlls/wined3d/query.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 3af56499904..bb860db4ebb 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -1571,7 +1571,9 @@ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags)
     if (query_vk->pending_count)
         goto unavailable;
 
-    if (!wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx))
+    /* If the query was suspended, and then ended before it was resumed,
+     * there's no data to accumulate here. */
+    if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx))
         goto unavailable;
 
     context_release(&context_vk->c);
-- 
2.20.1




More information about the wine-devel mailing list