[Mesa-dev] [PATCH 2/2] i965: Drop the remaining default predication whacking.

[Jordan Justen]

On Fri, Jun 6, 2014 at 12:23 AM, Kenneth Graunke <kenneth at whitecape.org> wrote:
> With my earlier cleaning in place, nothing relies on the instruction

What about referencing the commits if they are in a single series?

Series Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

> emitters for IF/WHILE/JMPI disabling predication.  Drop it in favor of
> making callers do the right thing explicitly.
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/brw_clip_tri.c | 1 +
>  src/mesa/drivers/dri/i965/brw_eu_emit.c  | 5 -----
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> index 3dd423e..ceae282 100644
> --- a/src/mesa/drivers/dri/i965/brw_clip_tri.c
> +++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c
> @@ -443,6 +443,7 @@ void brw_clip_tri( struct brw_clip_compile *c )
>        brw_ADD(p, c->reg.clipdistance_offset, c->reg.clipdistance_offset, brw_imm_w(sizeof(float)));
>     }
>     brw_WHILE(p);
> +   brw_set_default_predicate_control(p, BRW_PREDICATE_NONE);
>  }
>
>
> diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
> index b89070b..b0f96c7 100644
> --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
> +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
> @@ -1192,8 +1192,6 @@ struct brw_instruction *brw_JMPI(struct brw_compile *p,
>     insn->header.mask_control = BRW_MASK_DISABLE;
>     insn->header.predicate_control = predicate_control;
>
> -   p->current->header.predicate_control = BRW_PREDICATE_NONE;
> -
>     return insn;
>  }
>
> @@ -1286,8 +1284,6 @@ brw_IF(struct brw_compile *p, unsigned execute_size)
>     if (!p->single_program_flow)
>        insn->header.thread_control = BRW_THREAD_SWITCH;
>
> -   p->current->header.predicate_control = BRW_PREDICATE_NONE;
> -
>     push_if_stack(p, insn);
>     p->if_depth_in_loop[p->loop_stack_depth]++;
>     return insn;
> @@ -1770,7 +1766,6 @@ struct brw_instruction *brw_WHILE(struct brw_compile *p)
>        }
>     }
>     insn->header.compression_control = BRW_COMPRESSION_NONE;
> -   p->current->header.predicate_control = BRW_PREDICATE_NONE;
>
>     p->loop_stack_depth--;
>
> --
> 2.0.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev