[Mesa-dev] [PATCH 2/2] etnaviv: move sw query defines to etnaviv_query_sw.h

[Wladimir J. van der Laan]

On Tue, Sep 19, 2017 at 06:16:05PM +0200, Christian Gmeiner wrote:
> Also add new define ETNA_SW_QUERY_BASE.
> 
> 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.h    | 3 +--
>  src/gallium/drivers/etnaviv/etnaviv_query_sw.h | 3 +++
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_query.h b/src/gallium/drivers/etnaviv/etnaviv_query.h
> index cebd66238e..e099e10f7c 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_query.h
> +++ b/src/gallium/drivers/etnaviv/etnaviv_query.h
> @@ -53,8 +53,7 @@ etna_query(struct pipe_query *pq)
>     return (struct etna_query *)pq;
>  }
>  
> -#define ETNA_QUERY_DRAW_CALLS    (PIPE_QUERY_DRIVER_SPECIFIC + 0)
> -#define ETNA_QUERY_RS_OPERATIONS (PIPE_QUERY_DRIVER_SPECIFIC + 1)
> +#define ETNA_SW_QUERY_BASE       (PIPE_QUERY_DRIVER_SPECIFIC + 0)
>  
>  void
>  etna_query_screen_init(struct pipe_screen *pscreen);
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_sw.h b/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
> index f07d0f5915..9321147094 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
> +++ b/src/gallium/drivers/etnaviv/etnaviv_query_sw.h
> @@ -30,6 +30,9 @@
>  
>  #include "etnaviv_query.h"
>  
> +#define ETNA_QUERY_DRAW_CALLS    (ETNA_SW_QUERY_BASE + 0)
> +#define ETNA_QUERY_RS_OPERATIONS (ETNA_SW_QUERY_BASE + 1)
> +
>  struct etna_sw_query {
>     struct etna_query base;
>     uint64_t begin_value, end_value;
> -- 
> 2.13.5
> 
> _______________________________________________
> etnaviv mailing list
> etnaviv at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv