Henri Verbeet : wined3d: Do not accumulate ended queries in wined3d_query_vk_poll().
Alexandre Julliard
julliard at winehq.org
Thu Sep 24 15:49:04 CDT 2020
Module: wine
Branch: master
Commit: 3f3b0ac1f07e46f2e0205164a5e1fa9d10849ea9
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3b0ac1f07e46f2e0205164a5e1fa9d10849ea9
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Sep 23 17:39:59 2020 +0330
wined3d: Do not accumulate ended queries in wined3d_query_vk_poll().
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, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 3af5649990..bb860db4eb 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);
More information about the wine-cvs
mailing list