[Mesa-dev] [PATCH 04/23] i965: Make the brw_inst helpers take a device_info instead of a context

[Matt Turner]

On Fri, Apr 17, 2015 at 7:11 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
> ---
>  src/mesa/drivers/dri/i965/brw_clip_line.c        |   21 +-
>  src/mesa/drivers/dri/i965/brw_clip_tri.c         |   45 +-
>  src/mesa/drivers/dri/i965/brw_clip_unfilled.c    |   26 +-
>  src/mesa/drivers/dri/i965/brw_clip_util.c        |    2 +-
>  src/mesa/drivers/dri/i965/brw_disasm.c           |  472 +++++-----
>  src/mesa/drivers/dri/i965/brw_eu.c               |   26 +-
>  src/mesa/drivers/dri/i965/brw_eu.h               |   10 +-
>  src/mesa/drivers/dri/i965/brw_eu_compact.c       |  123 +--
>  src/mesa/drivers/dri/i965/brw_eu_emit.c          | 1001 +++++++++++-----------
>  src/mesa/drivers/dri/i965/brw_ff_gs_emit.c       |    7 +-
>  src/mesa/drivers/dri/i965/brw_fs_generator.cpp   |   54 +-
>  src/mesa/drivers/dri/i965/brw_inst.h             |  140 +--
>  src/mesa/drivers/dri/i965/brw_reg.h              |    4 +-
>  src/mesa/drivers/dri/i965/brw_sf_emit.c          |    7 +-
>  src/mesa/drivers/dri/i965/brw_vec4_generator.cpp |   28 +-
>  src/mesa/drivers/dri/i965/test_eu_compact.c      |   36 +-
>  16 files changed, 1006 insertions(+), 996 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_line.c b/src/mesa/drivers/dri/i965/brw_clip_line.c
> index 3b8af58..070adba 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_line.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_line.c
> @@ -158,9 +158,9 @@ static void clip_and_emit_line( struct brw_clip_compile *c )
>     if (brw->has_negative_rhw_bug) {
>        brw_AND(p, brw_null_reg(), get_element_ud(c->reg.R0, 2),
>                brw_imm_ud(1<<20));
> -      brw_inst_set_cond_modifier(brw, brw_last_inst, BRW_CONDITIONAL_NZ);
> +      brw_inst_set_cond_modifier(p->devinfo, brw_last_inst, BRW_CONDITIONAL_NZ);
>        brw_OR(p, c->reg.planemask, c->reg.planemask, brw_imm_ud(0x3f));
> -      brw_inst_set_pred_control(brw, brw_last_inst, BRW_PREDICATE_NORMAL);
> +      brw_inst_set_pred_control(p->devinfo, brw_last_inst, BRW_PREDICATE_NORMAL);
>     }
>
>     /* Set the initial vertex source mask: The first 6 planes are the bounds

I don't know how reasonable this suggestion is until I read further in
the series, but I'd rather pass 'p' to the brw_inst functions instead
of p->devinfo.

That would match better with brw_$INST functions and would shorten the
argument name instead of more than tripling it.