[Mesa-dev] [PATCH 8/8] st/nine: Queries: Always return D3D_OK when issuing with D3DISSUE_BEGIN

[Ilia Mirkin]

With the very minor corrections I've mentioned earlier, series is
Reviwed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Tue, Dec 2, 2014 at 4:12 PM, Axel Davy <axel.davy at ens.fr> wrote:
> This is the behaviour that wine tests.
>
> Reviewed-by: David Heidelberg <david at ixit.cz>
> Signed-off-by: Axel Davy <axel.davy at ens.fr>
> ---
>  src/gallium/state_trackers/nine/query9.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/nine/query9.c b/src/gallium/state_trackers/nine/query9.c
> index c87b019..163b818 100644
> --- a/src/gallium/state_trackers/nine/query9.c
> +++ b/src/gallium/state_trackers/nine/query9.c
> @@ -163,10 +163,15 @@ NineQuery9_Issue( struct NineQuery9 *This,
>
>      DBG("This=%p dwIssueFlags=%d\n", This, dwIssueFlags);
>
> -    user_assert((dwIssueFlags == D3DISSUE_BEGIN && !This->instant) ||
> +    user_assert((dwIssueFlags == D3DISSUE_BEGIN) ||
>                  (dwIssueFlags == 0) ||
>                  (dwIssueFlags == D3DISSUE_END), D3DERR_INVALIDCALL);
>
> +    /* Wine tests: always return D3D_OK on D3DISSUE_BEGIN
> +     * even when the call is supposed to be forbidden */
> +    if (dwIssueFlags == D3DISSUE_BEGIN && This->instant)
> +        return D3D_OK;
> +
>      if (dwIssueFlags == D3DISSUE_BEGIN) {
>          if (This->state == NINE_QUERY_STATE_RUNNING) {
>          pipe->end_query(pipe, This->pq);
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev