gallium/radeon: fix regression in a number of driver queries
authorNicolai Hähnle <nicolai.haehnle@amd.com>
Sat, 19 Dec 2015 04:25:16 +0000 (23:25 -0500)
committerNicolai Hähnle <nicolai.haehnle@amd.com>
Mon, 21 Dec 2015 20:47:10 +0000 (15:47 -0500)
This rather silly mistake was introduced by commit 01910676.

Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeon/r600_query.c

index ed0aefc9d32ed995d1fb1fa24439dd11080ca625..0aa19cd54fec66821e98b7b3a050ced7e594faac 100644 (file)
@@ -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");