Mesa (master): i965/vec4: Don't fix_math_operand() on Gen >= 8.

[Matt Turner]

Module: Mesa
Branch: master
Commit: b24e1cc6049d997e8f78283dcf6a75e99541faed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b24e1cc6049d997e8f78283dcf6a75e99541faed

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Jun 23 13:30:14 2014 -0700

i965/vec4: Don't fix_math_operand() on Gen >= 8.

The emit_math?_gen? functions serve to implement workarounds for the
math instruction, none of which exist on Gen8+.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index f3316f8..3a360d4 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -365,7 +365,9 @@ vec4_visitor::emit_math(opcode opcode, dst_reg dst, src_reg src)
       return;
    }
 
-   if (brw->gen >= 6) {
+   if (brw->gen >= 8) {
+      emit(opcode, dst, src);
+   } else if (brw->gen >= 6) {
       emit_math1_gen6(opcode, dst, src);
    } else {
       emit_math1_gen4(opcode, dst, src);
@@ -417,7 +419,9 @@ vec4_visitor::emit_math(enum opcode opcode,
       return;
    }
 
-   if (brw->gen >= 6) {
+   if (brw->gen >= 8) {
+      emit(opcode, dst, src0, src1);
+   } else if (brw->gen >= 6) {
       emit_math2_gen6(opcode, dst, src0, src1);
    } else {
       emit_math2_gen4(opcode, dst, src0, src1);