diff options
| -rw-r--r-- | src/gallium/state_trackers/nine/query9.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/nine/query9.c b/src/gallium/state_trackers/nine/query9.c index df49340..04f4aad 100644 --- a/src/gallium/state_trackers/nine/query9.c +++ b/src/gallium/state_trackers/nine/query9.c @@ -227,8 +227,13 @@ NineQuery9_GetData( struct NineQuery9 *This, wait_query_result = TRUE; } - /* Wine tests: D3DQUERYTYPE_TIMESTAMP always succeeds */ - wait_query_result |= This->type == D3DQUERYTYPE_TIMESTAMP; + /* The documention mentions no special case for D3DQUERYTYPE_TIMESTAMP. + * However Windows tests show that the query always succeeds when + * D3DGETDATA_FLUSH is specified. */ + if (This->type == D3DQUERYTYPE_TIMESTAMP && + (dwGetDataFlags & D3DGETDATA_FLUSH)) + wait_query_result = TRUE; + /* Note: We ignore dwGetDataFlags, because get_query_result will * flush automatically if needed */ |