diff options
| author | Matt Turner <mattst88@gmail.com> | 2015-02-12 02:01:49 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-02-24 12:17:20 +0000 |
| commit | 694d65655151582df64adaf05c6bc4c09539050f (patch) | |
| tree | 7e7ac1780e22a9a05d4dc7be1416daa284016d1b | |
| parent | c38068f5c14ab45df49b4711376ddd80ac8a6f99 (diff) | |
i965/vec4/vp: Use vec4_visitor::CMP.
... instead of emit(BRW_OPCODE_CMP, ...). In commit 6b3a301f I changed
vec4_visitor::CMP to set the destination's type to that of src0. In the
following commit (2335153f) I removed an apparently now unnecessary work
around for Gen8 that did the same thing.
But there was a single place that emitted a CMP instruction without
using the vec4_visitor::CMP function. Use it there.
And change dst_null_d to dst_null_f for good measure, since ARB vp
doesn't have integers.
Cc: "10.5" <mesa-stable@lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89032
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 72b9f8db2a035b52dbd59af0d2a6441cbde11a4c)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_vp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp index 85f2de577fc..27b0f9b0f15 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_vp.cpp @@ -43,8 +43,7 @@ vec4_visitor::emit_vp_sop(enum brw_conditional_mod conditional_mod, { vec4_instruction *inst; - inst = emit(BRW_OPCODE_CMP, dst_null_d(), src0, src1); - inst->conditional_mod = conditional_mod; + inst = emit(CMP(dst_null_f(), src0, src1, conditional_mod)); inst = emit(BRW_OPCODE_SEL, dst, one, src_reg(0.0f)); inst->predicate = BRW_PREDICATE_NORMAL; |