summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine/query9.c
diff options
context:
space:
mode:
authorAxel Davy <axel.davy@ens.fr>2014-12-02 22:01:44 +0100
committerAxel Davy <axel.davy@ens.fr>2014-12-03 16:39:24 +0100
commit2f78259c1115bd84257a120b5d24366d6d1429bf (patch)
tree28c940d95a967d4e45112d4e01acd21f7f86512c /src/gallium/state_trackers/nine/query9.c
parent225d7f8e0ecf875ded0f1a42133995b2d2248cf5 (diff)
downloadexternal_mesa3d-2f78259c1115bd84257a120b5d24366d6d1429bf.zip
external_mesa3d-2f78259c1115bd84257a120b5d24366d6d1429bf.tar.gz
external_mesa3d-2f78259c1115bd84257a120b5d24366d6d1429bf.tar.bz2
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>
Diffstat (limited to 'src/gallium/state_trackers/nine/query9.c')
-rw-r--r--src/gallium/state_trackers/nine/query9.c3
1 files changed, 3 insertions, 0 deletions
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 */