Module: Mesa
Branch: master
Commit: ea8c0b16ec222786c32bf6fc735613c25b28a6ca
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea8c0b16ec222786c32bf6fc735613c25b28a6ca

Author: Nicolai Hähnle <[email protected]>
Date:   Fri Dec 18 23:25:16 2015 -0500

gallium/radeon: fix regression in a number of driver queries

This rather silly mistake was introduced by commit 01910676.

Cc: "11.1" <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

---

 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");

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to