From: Matt Turner <mattst88@gmail.com>
Date: Mon, 23 Jun 2014 20:30:14 +0000 (-0700)
Subject: i965/vec4: Don't fix_math_operand() on Gen >= 8.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b24e1cc6049d997e8f78283dcf6a75e99541faed;p=mesa.git

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@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index f3316f8a148..3a360d452d2 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);