[PATCH 09/11] etnaviv: adopt shader-db output for variant support

[Lucas Stach]

Am Sonntag, den 26.03.2017, 16:13 +0200 schrieb Christian Gmeiner:
> Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>

s/adopt/adapt in the subject

Reviewed-by: Lucas Stach <l.stach at pengutronix.de>

> ---
>  src/gallium/drivers/etnaviv/etnaviv_shader.c | 30 ++++++++++++++--------------
>  1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
> index b1cac02..4a0b74b 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
> @@ -238,26 +238,26 @@ etna_shader_stage(struct etna_shader_variant *shader)
>  }
>  
>  static void
> -dump_shader_info(struct etna_shader_variant *shader, struct pipe_debug_callback *debug)
> +dump_shader_info(struct etna_shader_variant *v, struct pipe_debug_callback *debug)
>  {
>     if (!unlikely(etna_mesa_debug & ETNA_DBG_SHADERDB))
>        return;
>  
>     pipe_debug_message(debug, SHADER_INFO, "\n"
> -         "SHADER-DB: %s prog %d: %u instructions %u temps\n"
> -         "SHADER-DB: %s prog %d: %u immediates %u consts\n"
> -         "SHADER-DB: %s prog %d: %u loops\n",
> -         etna_shader_stage(shader),
> -         shader->id,
> -         shader->code_size,
> -         shader->num_temps,
> -         etna_shader_stage(shader),
> -         shader->id,
> -         shader->uniforms.imm_count,
> -         shader->uniforms.const_count,
> -         etna_shader_stage(shader),
> -         shader->id,
> -         shader->num_loops);
> +         "SHADER-DB: %s prog %d/%d: %u instructions %u temps\n"
> +         "SHADER-DB: %s prog %d/%d: %u immediates %u consts\n"
> +         "SHADER-DB: %s prog %d/%d: %u loops\n",
> +         etna_shader_stage(v),
> +         v->shader->id, v->id,
> +         v->code_size,
> +         v->num_temps,
> +         etna_shader_stage(v),
> +         v->shader->id, v->id,
> +         v->uniforms.imm_count,
> +         v->uniforms.const_count,
> +         etna_shader_stage(v),
> +         v->shader->id, v->id,
> +         v->num_loops);
>  }
>  
>  bool