Import Mesa 18.3.2

1 files changed, 5 insertions, 9 deletions

diff --git a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query_pm.c b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query_pm.c
index 1c9061f8a..ade0b9790 100644
--- a/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query_pm.c
+++ b/lib/mesa/src/gallium/drivers/etnaviv/etnaviv_query_pm.c
@@ -485,9 +485,9 @@ etna_pm_query_get(struct etna_cmd_stream *stream, struct etna_query *q,
    assert(flags);
 
    if (flags == ETNA_PM_PROCESS_PRE)
-      offset = 1;
-   else
       offset = 2;
+   else
+      offset = 3;
 
    struct etna_perf p = {
       .flags = flags,
@@ -518,7 +518,7 @@ etna_pm_destroy_query(struct etna_context *ctx, struct etna_query *q)
    FREE(pq);
 }
 
-static bool
+static boolean
 etna_pm_begin_query(struct etna_context *ctx, struct etna_query *q)
 {
    struct etna_pm_query *pq = etna_pm_query(q);
@@ -537,9 +537,9 @@ etna_pm_end_query(struct etna_context *ctx, struct etna_query *q)
    etna_pm_query_get(ctx->stream, q, ETNA_PM_PROCESS_POST);
 }
 
-static bool
+static boolean
 etna_pm_get_query_result(struct etna_context *ctx, struct etna_query *q,
-                         bool wait, union pipe_query_result *result)
+                         boolean wait, union pipe_query_result *result)
 {
    struct etna_pm_query *pq = etna_pm_query(q);
 
@@ -639,10 +639,6 @@ etna_pm_get_driver_query_info(struct pipe_screen *pscreen, unsigned index,
    info->name = query_config[i].name;
    info->query_type = query_config[i].type;
    info->group_id = query_config[i].group_id;
-   info->type = PIPE_DRIVER_QUERY_TYPE_UINT;
-   info->result_type = PIPE_DRIVER_QUERY_RESULT_TYPE_AVERAGE;
-   info->max_value.u32 = 0;
-   info->flags = 0;
 
    return 1;
 }