From: Xavier Bouchoux Date: Sat, 21 Feb 2015 18:56:40 +0000 (+0100) Subject: st/nine: Improve D3DQUERYTYPE_TIMESTAMP X-Git-Tag: upstream/17.1.0~19190 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d838fe8243aa0e96b198c876c1b5d79c098d1c0d;p=platform%2Fupstream%2Fmesa.git st/nine: Improve D3DQUERYTYPE_TIMESTAMP Avoid blocking when retrieving D3DQUERYTYPE_TIMESTAMP result with NineQuery9_GetData(), when D3DGETDATA_FLUSH is not specified. This mimics Win behaviour and gives slightly better performance for some games. Reviewed-by: Ilia Mirkin Reviewed-by: Axel Davy Signed-off-by: Xavier Bouchoux --- 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 */