diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-05-30 15:16:12 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-06-02 15:09:29 -0700 |
| commit | ff340ce3c3326959027d7cb9a611c6fab1d89941 (patch) | |
| tree | 8e9deea67bd14d9acf103ee23944d4fe55255a9a /src/mesa/drivers/dri/i965/brw_clip_tri.c | |
| parent | 0985da542366cb6be8dc287db4a74c828a7e8fa4 (diff) | |
| download | external_mesa3d-ff340ce3c3326959027d7cb9a611c6fab1d89941.zip external_mesa3d-ff340ce3c3326959027d7cb9a611c6fab1d89941.tar.gz external_mesa3d-ff340ce3c3326959027d7cb9a611c6fab1d89941.tar.bz2 | |
i965: Stop setting predication from brw_set_conditionalmod.
brw_set_conditionalmod has traditionally been complex: it causes
conditionalmod to be set for the next instruction, and then predication
to be set on all future instructions after that.
We may want to generate a flag condition and not use it immediately,
due to instruction scheduling or the like. Even if not, it's easy
to set things explicitly, and that's clearer.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_clip_tri.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_clip_tri.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_clip_tri.c b/src/mesa/drivers/dri/i965/brw_clip_tri.c index 289f4cc..9118cf7 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_tri.c +++ b/src/mesa/drivers/dri/i965/brw_clip_tri.c @@ -407,6 +407,7 @@ void brw_clip_tri( struct brw_clip_compile *c ) brw_ADD(p, c->reg.loopcount, c->reg.loopcount, brw_imm_d(-1)); } brw_WHILE(p); + brw_last_inst->header.predicate_control = BRW_PREDICATE_NORMAL; /* vtxPrev = *(outlist_ptr-1) OR: outlist[nr_verts-1] * inlist = outlist @@ -485,6 +486,7 @@ void brw_clip_tri_emit_polygon(struct brw_clip_compile *c) brw_ADD(p, c->reg.loopcount, c->reg.loopcount, brw_imm_d(-1)); } brw_WHILE(p); + brw_last_inst->header.predicate_control = BRW_PREDICATE_NORMAL; brw_clip_emit_vue(c, v0, BRW_URB_WRITE_EOT_COMPLETE, ((_3DPRIM_TRIFAN << URB_WRITE_PRIM_TYPE_SHIFT) |