diff options
| author | Eric Anholt <eric@anholt.net> | 2012-10-03 13:23:05 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-10-17 12:24:00 -0700 |
| commit | 54679fcbcae7a2d41cb439e52e386bd811a291b4 (patch) | |
| tree | e0bce67791fa46e6cf751e97653c8235249ae91b /src/mesa/drivers/dri/i965/brw_fs_fp.cpp | |
| parent | 7abfb67dc42ec3a96443ed025807267646c56e86 (diff) | |
i965: Share the predicate field between FS and VS.
Note that BRW_PREDICATE_NONE is 0 and BRW_PREDICATE_NORMAL is 1, so that's a
lot like the true/false we had in the FS before.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_fp.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp index 080435b5114..c0a88105e81 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_fp.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_fp.cpp @@ -93,7 +93,7 @@ fs_visitor::emit_fp_sop(uint32_t conditional_mod, inst->conditional_mod = conditional_mod; inst = emit(BRW_OPCODE_SEL, regoffset(dst, i), one, fs_reg(0.0f)); - inst->predicated = true; + inst->predicate = BRW_PREDICATE_NORMAL; } } } @@ -177,7 +177,7 @@ fs_visitor::emit_fragment_program_code() inst = emit(BRW_OPCODE_SEL, regoffset(dst, i), regoffset(src[1], i), regoffset(src[2], i)); - inst->predicated = true; + inst->predicate = BRW_PREDICATE_NORMAL; } } break; @@ -261,7 +261,7 @@ fs_visitor::emit_fragment_program_code() inst->conditional_mod = BRW_CONDITIONAL_L; inst = emit(BRW_OPCODE_IF); - inst->predicated = true; + inst->predicate = BRW_PREDICATE_NORMAL; emit(FS_OPCODE_DISCARD); emit(BRW_OPCODE_ENDIF); } @@ -300,7 +300,7 @@ fs_visitor::emit_fragment_program_code() if (fpi->DstReg.WriteMask & WRITEMASK_Y) { emit(BRW_OPCODE_MOV, regoffset(dst, 1), regoffset(src[0], 0)); inst = emit(BRW_OPCODE_MOV, regoffset(dst, 1), fs_reg(0.0f)); - inst->predicated = true; + inst->predicate = BRW_PREDICATE_NORMAL; } if (fpi->DstReg.WriteMask & WRITEMASK_Z) { @@ -308,7 +308,7 @@ fs_visitor::emit_fragment_program_code() regoffset(src[0], 1), regoffset(src[0], 3)); inst = emit(BRW_OPCODE_MOV, regoffset(dst, 2), fs_reg(0.0f)); - inst->predicated = true; + inst->predicate = BRW_PREDICATE_NORMAL; } } |