From: Eric Anholt <eric@anholt.net>
Date: Mon, 12 Jul 2010 19:03:33 +0000 (-0700)
Subject: Revert "ir_to_mesa: Add support for adding/subtracting matrices."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b48843ecd6690902e4f3bd709a041133b7fb540;p=mesa.git

Revert "ir_to_mesa: Add support for adding/subtracting matrices."

This reverts commit b4d0c0e0ee983ee614b047799c3e01221a353c98.
Now that ir_mat_op_to_vec is landed, this change is no longer needed.
---

diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index 81b91918cb0..c636d69abaa 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -178,13 +178,6 @@ public:
 				   ir_to_mesa_src_reg src0,
 				   ir_to_mesa_src_reg src1);
 
-   void ir_to_mesa_emit_addsub(ir_expression *ir,
-			       enum prog_opcode opcode,
-			       struct ir_to_mesa_src_reg result_src,
-			       struct ir_to_mesa_dst_reg result_dst,
-			       struct ir_to_mesa_src_reg op0,
-			       struct ir_to_mesa_src_reg op1);
-
    int *sampler_map;
    int sampler_map_size;
 
@@ -537,32 +530,6 @@ ir_to_mesa_visitor::visit(ir_function *ir)
    }
 }
 
-void
-ir_to_mesa_visitor::ir_to_mesa_emit_addsub(ir_expression *ir,
-					   enum prog_opcode opcode,
-					   struct ir_to_mesa_src_reg result_src,
-					   struct ir_to_mesa_dst_reg result_dst,
-					   struct ir_to_mesa_src_reg op0,
-					   struct ir_to_mesa_src_reg op1)
-{
-   ir_to_mesa_dst_reg dst_column = result_dst;
-   int matrix_columns;
-
-   if (ir->operands[0]->type->is_matrix())
-      matrix_columns = ir->operands[0]->type->matrix_columns;
-   else
-      matrix_columns = ir->operands[1]->type->matrix_columns;
-
-   for (int i = 0; i < matrix_columns; i++) {
-      ir_to_mesa_emit_op2(ir, opcode, dst_column, op0, op1);
-      dst_column.index++;
-      if (ir->operands[0]->type->is_matrix())
-	 op0.index++;
-      if (ir->operands[1]->type->is_matrix())
-	 op1.index++;
-   }
-}
-
 void
 ir_to_mesa_visitor::visit(ir_expression *ir)
 {
@@ -587,8 +554,7 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
 
       /* Only expression implemented for matrices yet */
       assert(!ir->operands[operand]->type->is_matrix() ||
-	     ir->operation == ir_binop_mul ||
-	     ir->operation == ir_binop_add);
+	     ir->operation == ir_binop_mul);
    }
 
    this->result.file = PROGRAM_UNDEFINED;
@@ -652,12 +618,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
       break;
 
    case ir_binop_add:
-      ir_to_mesa_emit_addsub(ir, OPCODE_ADD,
-			     result_src, result_dst, op[0], op[1]);
+      ir_to_mesa_emit_op2(ir, OPCODE_ADD, result_dst, op[0], op[1]);
       break;
    case ir_binop_sub:
-      ir_to_mesa_emit_addsub(ir, OPCODE_SUB,
-			     result_src, result_dst, op[0], op[1]);
+      ir_to_mesa_emit_op2(ir, OPCODE_SUB, result_dst, op[0], op[1]);
       break;
 
    case ir_binop_mul: