From 9935fe705df44bb633039ca74332cc0c126ccc30 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 17 Nov 2010 13:59:17 -0800
Subject: glsl: Remove the ir_binop_cross opcode.

---
 src/mesa/drivers/dri/i965/brw_fs.cpp               |  1 -
 .../dri/i965/brw_fs_channel_expressions.cpp        | 28 ----------------------
 src/mesa/program/ir_to_mesa.cpp                    |  4 ----
 3 files changed, 33 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 4648298c1f5..9c03b61c82e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -850,7 +850,6 @@ fs_visitor::visit(ir_expression *ir)
       break;
 
    case ir_binop_dot:
-   case ir_binop_cross:
    case ir_unop_any:
       assert(!"not reached: should be handled by brw_fs_channel_expressions");
       break;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
index 2a6da4058b8..3b7b03a05b8 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp
@@ -288,34 +288,6 @@ ir_channel_expressions_visitor::visit_leave(ir_assignment *ir)
       break;
    }
 
-   case ir_binop_cross: {
-      for (i = 0; i < vector_elements; i++) {
-	 int swiz0 = (i + 1) % 3;
-	 int swiz1 = (i + 2) % 3;
-	 ir_expression *temp1, *temp2;
-
-	 temp1 = new(mem_ctx) ir_expression(ir_binop_mul,
-					    element_type,
-					    get_element(op_var[0], swiz0),
-					    get_element(op_var[1], swiz1));
-
-	 temp2 = new(mem_ctx) ir_expression(ir_binop_mul,
-					    element_type,
-					    get_element(op_var[1], swiz0),
-					    get_element(op_var[0], swiz1));
-
-	 temp2 = new(mem_ctx) ir_expression(ir_unop_neg,
-					    element_type,
-					    temp2,
-					    NULL);
-
-	 assign(ir, i, new(mem_ctx) ir_expression(ir_binop_add,
-						  element_type,
-						  temp1, temp2));
-      }
-      break;
-   }
-
    case ir_binop_logic_and:
    case ir_binop_logic_xor:
    case ir_binop_logic_or:
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index f45bbf55821..0458625ab0c 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1058,10 +1058,6 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
 			 ir->operands[0]->type->vector_elements);
       break;
 
-   case ir_binop_cross:
-      ir_to_mesa_emit_op2(ir, OPCODE_XPD, result_dst, op[0], op[1]);
-      break;
-
    case ir_unop_sqrt:
       /* sqrt(x) = x * rsq(x). */
       ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
-- 
cgit v1.2.3