diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-05-30 17:29:55 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-06-02 15:09:33 -0700 |
| commit | fea7b9774215becbaaa58ac825b189460801fac1 (patch) | |
| tree | d4a46d74002465a9ff1948181ccbb29b5298e26e /src/mesa/drivers/dri/i965/brw_sf_emit.c | |
| parent | 776ad51165b1f7ee18a9a4cccbed1ce3b2c4fcf9 (diff) | |
| download | external_mesa3d-fea7b9774215becbaaa58ac825b189460801fac1.zip external_mesa3d-fea7b9774215becbaaa58ac825b189460801fac1.tar.gz external_mesa3d-fea7b9774215becbaaa58ac825b189460801fac1.tar.bz2 | |
i965: Eliminate brw_set_conditionalmod from the Gen4-5 compilers.
With the predication changes eliminated, all this does is set the
conditional modifier on a single instruction. Doing that directly is
easy, and avoids mucking about with default state.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_sf_emit.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sf_emit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sf_emit.c b/src/mesa/drivers/dri/i965/brw_sf_emit.c index 479d6d5..8897596 100644 --- a/src/mesa/drivers/dri/i965/brw_sf_emit.c +++ b/src/mesa/drivers/dri/i965/brw_sf_emit.c @@ -762,7 +762,6 @@ void brw_emit_anyprim_setup( struct brw_sf_compile *c ) brw_MOV(p, primmask, brw_imm_ud(1)); brw_SHL(p, primmask, primmask, payload_prim); - brw_set_conditionalmod(p, BRW_CONDITIONAL_Z); brw_AND(p, v1_null_ud, primmask, brw_imm_ud((1<<_3DPRIM_TRILIST) | (1<<_3DPRIM_TRISTRIP) | (1<<_3DPRIM_TRIFAN) | @@ -770,23 +769,24 @@ void brw_emit_anyprim_setup( struct brw_sf_compile *c ) (1<<_3DPRIM_POLYGON) | (1<<_3DPRIM_RECTLIST) | (1<<_3DPRIM_TRIFAN_NOSTIPPLE))); + brw_last_inst->header.destreg__conditionalmod = BRW_CONDITIONAL_Z; jmp = brw_JMPI(p, brw_imm_d(0), BRW_PREDICATE_NORMAL) - p->store; brw_emit_tri_setup(c, false); brw_land_fwd_jump(p, jmp); - brw_set_conditionalmod(p, BRW_CONDITIONAL_Z); brw_AND(p, v1_null_ud, primmask, brw_imm_ud((1<<_3DPRIM_LINELIST) | (1<<_3DPRIM_LINESTRIP) | (1<<_3DPRIM_LINELOOP) | (1<<_3DPRIM_LINESTRIP_CONT) | (1<<_3DPRIM_LINESTRIP_BF) | (1<<_3DPRIM_LINESTRIP_CONT_BF))); + brw_last_inst->header.destreg__conditionalmod = BRW_CONDITIONAL_Z; jmp = brw_JMPI(p, brw_imm_d(0), BRW_PREDICATE_NORMAL) - p->store; brw_emit_line_setup(c, false); brw_land_fwd_jump(p, jmp); - brw_set_conditionalmod(p, BRW_CONDITIONAL_Z); brw_AND(p, v1_null_ud, payload_attr, brw_imm_ud(1<<BRW_SPRITE_POINT_ENABLE)); + brw_last_inst->header.destreg__conditionalmod = BRW_CONDITIONAL_Z; jmp = brw_JMPI(p, brw_imm_d(0), BRW_PREDICATE_NORMAL) - p->store; brw_emit_point_sprite_setup(c, false); brw_land_fwd_jump(p, jmp); |