From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 9 Sep 2013 22:32:26 +0000 (-0700)
Subject: Revert "i965/vec4: Only zero out unused message components when there are any."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bb3cd8090c0897f695008aede5d5a2322d7af42;p=mesa.git

Revert "i965/vec4: Only zero out unused message components when there are any."

This reverts commit 6c3db2167c64ecf2366862f15f8e2d4a91f1028c, which I
accidentally pushed along with other code.  A better version of the fix
will be committed later.
---

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index 7ced32c6e8b..28dc313e431 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -2251,10 +2251,8 @@ vec4_visitor::visit(ir_texture *ir)
 	 emit(MOV(dst_reg(MRF, param_base, ir->coordinate->type, coord_mask),
 		  coordinate));
       }
-      if (zero_mask != 0) {
-         emit(MOV(dst_reg(MRF, param_base, ir->coordinate->type, zero_mask),
-                  src_reg(0)));
-      }
+      emit(MOV(dst_reg(MRF, param_base, ir->coordinate->type, zero_mask),
+	       src_reg(0)));
       /* Load the shadow comparitor */
       if (ir->shadow_comparitor && ir->op != ir_txd) {
 	 emit(MOV(dst_reg(MRF, param_base + 1, ir->shadow_comparitor->type,