[Mesa-dev] [PATCH 1/2] gallium/radeon: use enums in r600_query.h

[Nicolai Hähnle]

This is nicer indeed. For the series:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

On 16.04.2016 07:50, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> ---
>   src/gallium/drivers/radeon/r600_query.h | 43 ++++++++++++++++++---------------
>   1 file changed, 23 insertions(+), 20 deletions(-)
>
> diff --git a/src/gallium/drivers/radeon/r600_query.h b/src/gallium/drivers/radeon/r600_query.h
> index 9f3a917..6bb9374 100644
> --- a/src/gallium/drivers/radeon/r600_query.h
> +++ b/src/gallium/drivers/radeon/r600_query.h
> @@ -40,26 +40,29 @@ struct r600_query;
>   struct r600_query_hw;
>   struct r600_resource;
>
> -#define R600_QUERY_DRAW_CALLS		(PIPE_QUERY_DRIVER_SPECIFIC + 0)
> -#define R600_QUERY_REQUESTED_VRAM	(PIPE_QUERY_DRIVER_SPECIFIC + 1)
> -#define R600_QUERY_REQUESTED_GTT	(PIPE_QUERY_DRIVER_SPECIFIC + 2)
> -#define R600_QUERY_BUFFER_WAIT_TIME	(PIPE_QUERY_DRIVER_SPECIFIC + 3)
> -#define R600_QUERY_NUM_CS_FLUSHES	(PIPE_QUERY_DRIVER_SPECIFIC + 4)
> -#define R600_QUERY_NUM_BYTES_MOVED	(PIPE_QUERY_DRIVER_SPECIFIC + 5)
> -#define R600_QUERY_VRAM_USAGE		(PIPE_QUERY_DRIVER_SPECIFIC + 6)
> -#define R600_QUERY_GTT_USAGE		(PIPE_QUERY_DRIVER_SPECIFIC + 7)
> -#define R600_QUERY_GPU_TEMPERATURE	(PIPE_QUERY_DRIVER_SPECIFIC + 8)
> -#define R600_QUERY_CURRENT_GPU_SCLK	(PIPE_QUERY_DRIVER_SPECIFIC + 9)
> -#define R600_QUERY_CURRENT_GPU_MCLK	(PIPE_QUERY_DRIVER_SPECIFIC + 10)
> -#define R600_QUERY_GPU_LOAD		(PIPE_QUERY_DRIVER_SPECIFIC + 11)
> -#define R600_QUERY_NUM_COMPILATIONS	(PIPE_QUERY_DRIVER_SPECIFIC + 12)
> -#define R600_QUERY_NUM_SHADERS_CREATED	(PIPE_QUERY_DRIVER_SPECIFIC + 13)
> -#define R600_QUERY_GPIN_ASIC_ID		(PIPE_QUERY_DRIVER_SPECIFIC + 14)
> -#define R600_QUERY_GPIN_NUM_SIMD	(PIPE_QUERY_DRIVER_SPECIFIC + 15)
> -#define R600_QUERY_GPIN_NUM_RB		(PIPE_QUERY_DRIVER_SPECIFIC + 16)
> -#define R600_QUERY_GPIN_NUM_SPI		(PIPE_QUERY_DRIVER_SPECIFIC + 17)
> -#define R600_QUERY_GPIN_NUM_SE		(PIPE_QUERY_DRIVER_SPECIFIC + 18)
> -#define R600_QUERY_FIRST_PERFCOUNTER	(PIPE_QUERY_DRIVER_SPECIFIC + 100)
> +enum {
> +	R600_QUERY_DRAW_CALLS = PIPE_QUERY_DRIVER_SPECIFIC,
> +	R600_QUERY_REQUESTED_VRAM,
> +	R600_QUERY_REQUESTED_GTT,
> +	R600_QUERY_BUFFER_WAIT_TIME,
> +	R600_QUERY_NUM_CS_FLUSHES,
> +	R600_QUERY_NUM_BYTES_MOVED,
> +	R600_QUERY_VRAM_USAGE,
> +	R600_QUERY_GTT_USAGE,
> +	R600_QUERY_GPU_TEMPERATURE,
> +	R600_QUERY_CURRENT_GPU_SCLK,
> +	R600_QUERY_CURRENT_GPU_MCLK,
> +	R600_QUERY_GPU_LOAD,
> +	R600_QUERY_NUM_COMPILATIONS,
> +	R600_QUERY_NUM_SHADERS_CREATED,
> +	R600_QUERY_GPIN_ASIC_ID,
> +	R600_QUERY_GPIN_NUM_SIMD,
> +	R600_QUERY_GPIN_NUM_RB,
> +	R600_QUERY_GPIN_NUM_SPI,
> +	R600_QUERY_GPIN_NUM_SE,
> +
> +	R600_QUERY_FIRST_PERFCOUNTER = PIPE_QUERY_DRIVER_SPECIFIC + 100,
> +};
>
>   enum {
>   	R600_QUERY_GROUP_GPIN = 0,
>