Mesa (master): etnaviv: call util_query_clear_result(..) in the generic layer

[Christian Gmeiner]

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

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Sun Oct  8 22:00:07 2017 +0200

etnaviv: call util_query_clear_result(..) in the generic layer

Saves us from calling util_query_clear_result(..) in every query
type implementation.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Wladimir J. van der Laan <laanwj at gmail.com>

---

 src/gallium/drivers/etnaviv/etnaviv_query.c    | 3 +++
 src/gallium/drivers/etnaviv/etnaviv_query_sw.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.c b/src/gallium/drivers/etnaviv/etnaviv_query.c
index 089a26e6fd..a416a7cb0f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_query.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query.c
@@ -26,6 +26,7 @@
  */
 
 #include "pipe/p_screen.h"
+#include "util/u_inlines.h"
 
 #include "etnaviv_context.h"
 #include "etnaviv_query.h"
@@ -89,6 +90,8 @@ etna_get_query_result(struct pipe_context *pctx, struct pipe_query *pq,
    if (q->active)
       return false;
 
+   util_query_clear_result(result, q->type);
+
    return q->funcs->get_query_result(etna_context(pctx), q, wait, result);
 }
 
diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_sw.c b/src/gallium/drivers/etnaviv/etnaviv_query_sw.c
index 7b93339377..ea79467b61 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_query_sw.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_query_sw.c
@@ -27,7 +27,6 @@
 
 #include "os/os_time.h"
 #include "pipe/p_state.h"
-#include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 
@@ -81,7 +80,6 @@ etna_sw_get_query_result(struct etna_context *ctx, struct etna_query *q,
 {
    struct etna_sw_query *sq = etna_sw_query(q);
 
-   util_query_clear_result(result, q->type);
    result->u64 = sq->end_value - sq->begin_value;
 
    return true;