Mesa (master): st/nine: Queries: always succeed for D3DQUERYTYPE_TIMESTAMP when flushing

[Ilia Mirkin]

Module: Mesa
Branch: master
Commit: 2f78259c1115bd84257a120b5d24366d6d1429bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f78259c1115bd84257a120b5d24366d6d1429bf

Author: Axel Davy <axel.davy at ens.fr>
Date:   Tue Dec  2 22:01:44 2014 +0100

st/nine: Queries: always succeed for D3DQUERYTYPE_TIMESTAMP when flushing

This is the behaviour that Wine tests

Tested-by: David Heidelberg <david at ixit.cz>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
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 9d74ab8..9372556 100644
--- a/src/gallium/state_trackers/nine/query9.c
+++ b/src/gallium/state_trackers/nine/query9.c
@@ -223,6 +223,9 @@ NineQuery9_GetData( struct NineQuery9 *This,
         wait_query_result = TRUE;
     }
 
+    /* Wine tests: D3DQUERYTYPE_TIMESTAMP always succeeds */
+    wait_query_result |= This->type == D3DQUERYTYPE_TIMESTAMP;
+
     /* Note: We ignore dwGetDataFlags, because get_query_result will
      * flush automatically if needed */