[Mesa-stable] [PATCH v3 18/19] st/nine: Queries: always succeed for D3DQUERYTYPE_TIMESTAMP when flushing

[David Heidelberg]

From: Axel Davy <axel.davy at ens.fr>

This is the behaviour that Wine tests

Cc: "10.4" <mesa-stable at lists.freedesktop.org>
Tested-by: David Heidelberg <david at ixit.cz>
Signed-off-by: Axel Davy <axel.davy at ens.fr>
---
 src/gallium/state_trackers/nine/query9.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/state_trackers/nine/query9.c b/src/gallium/state_trackers/nine/query9.c
index 04ad3db..15564f6 100644
--- a/src/gallium/state_trackers/nine/query9.c
+++ b/src/gallium/state_trackers/nine/query9.c
@@ -228,6 +228,9 @@ NineQuery9_GetData( struct NineQuery9 *This,
     ok = pipe->get_query_result(pipe, This->pq, FALSE, &presult);
     if (!ok && flush_if_needed) {
         pipe->flush(pipe, NULL, 0);
+        /* Wine tests: D3DQUERYTYPE_TIMESTAMP always succeeds
+         * directly when flushed */
+        wait_query_result |= This->type == D3DQUERYTYPE_TIMESTAMP;
         ok = pipe->get_query_result(pipe, This->pq, wait_query_result, &presult);
         This->state = NINE_QUERY_STATE_FLUSHED;
     }
-- 
2.1.3