From: Axel Davy <axel.davy@ens.fr>
Date: Tue, 2 Dec 2014 21:01:44 +0000 (+0100)
Subject: st/nine: Queries: always succeed for D3DQUERYTYPE_TIMESTAMP when flushing
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f78259c1115bd84257a120b5d24366d6d1429bf;p=mesa.git

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

This is the behaviour that Wine tests

Tested-by: David Heidelberg <david@ixit.cz>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/query9.c b/src/gallium/state_trackers/nine/query9.c
index 9d74ab8fad9..937255667be 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 */