[Mesa-dev] [PATCH] radv: Stop shadowing the result in radv_GetQueryPoolResults.

[Dave Airlie]

On 12 April 2017 at 08:48, Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl> wrote:
> The outer result was referred to, which meant bugs.
>
> Signed-off-by: Bas Nieuwenhuizen <basni at google.com>

Oops,

Reviewed-by: Dave Airlie <airlied at redhat.com>

> ---
>  src/amd/vulkan/radv_query.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
> index bd293b58e69..fa5a3b6df24 100644
> --- a/src/amd/vulkan/radv_query.c
> +++ b/src/amd/vulkan/radv_query.c
> @@ -876,7 +876,7 @@ VkResult radv_GetQueryPoolResults(
>                 }
>                 case VK_QUERY_TYPE_OCCLUSION: {
>                         volatile uint64_t const *src64 = (volatile uint64_t const *)src;
> -                       uint64_t result = 0;
> +                       uint64_t sample_count = 0;
>                         int db_count = get_max_db(device);
>                         available = 1;
>
> @@ -890,7 +890,7 @@ VkResult radv_GetQueryPoolResults(
>                                 if (!(start & (1ull << 63)) || !(end & (1ull << 63)))
>                                         available = 0;
>                                 else {
> -                                       result += end - start;
> +                                       sample_count += end - start;
>                                 }
>                         }
>
> @@ -901,10 +901,10 @@ VkResult radv_GetQueryPoolResults(
>                         }
>
>                         if (flags & VK_QUERY_RESULT_64_BIT) {
> -                               *(uint64_t*)dest = result;
> +                               *(uint64_t*)dest = sample_count;
>                                 dest += 8;
>                         } else {
> -                               *(uint32_t*)dest = result;
> +                               *(uint32_t*)dest = sample_count;
>                                 dest += 4;
>                         }
>                         break;
> --
> 2.12.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev