fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Drop the remaining default predication whacking.

Browse source 
With my earlier cleaning in place (see git log brw_eu_emit.c), nothing
relies on the instruction 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@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Kenneth Graunke 2014-06-05 22:59:10 -07:00
parent 8a314a784c
commit 1f3735bff0
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_clip_tri.c
View file

@ -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);
}

5
src/mesa/drivers/dri/i965/brw_eu_emit.c
View file

@ -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--;