[Mesa-stable] [Mesa-dev] [PATCH] gallium/radeon: fix regression in a number of driver queries

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

On Mon, Dec 21, 2015 at 5:57 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> This rather silly mistake was introduced by commit 01910676.
>
> Cc: "11.1" <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeon/r600_query.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
> index ed0aefc..0aa19cd 100644
> --- a/src/gallium/drivers/radeon/r600_query.c
> +++ b/src/gallium/drivers/radeon/r600_query.c
> @@ -119,7 +119,7 @@ static void r600_query_sw_end(struct r600_common_context *rctx,
>                 rctx->b.flush(&rctx->b, &query->fence, 0);
>                 break;
>         case R600_QUERY_DRAW_CALLS:
> -               query->begin_result = rctx->num_draw_calls;
> +               query->end_result = rctx->num_draw_calls;
>                 break;
>         case R600_QUERY_REQUESTED_VRAM:
>         case R600_QUERY_REQUESTED_GTT:
> @@ -141,10 +141,10 @@ static void r600_query_sw_end(struct r600_common_context *rctx,
>                 query->begin_result = 0;
>                 break;
>         case R600_QUERY_NUM_COMPILATIONS:
> -               query->begin_result = p_atomic_read(&rctx->screen->num_compilations);
> +               query->end_result = p_atomic_read(&rctx->screen->num_compilations);
>                 break;
>         case R600_QUERY_NUM_SHADERS_CREATED:
> -               query->begin_result = p_atomic_read(&rctx->screen->num_shaders_created);
> +               query->end_result = p_atomic_read(&rctx->screen->num_shaders_created);
>                 break;
>         default:
>                 unreachable("r600_query_sw_end: bad query type");
> --
> 2.5.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev