From: Eric Anholt <eric@anholt.net>
Date: Fri, 27 Aug 2010 21:15:42 +0000 (-0700)
Subject: i965: Don't strip negate/abs flags when assigning uniform locations.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d20c2766182b632fba296eff7328bf14c802096e;p=mesa.git

i965: Don't strip negate/abs flags when assigning uniform locations.

Fixes glsl-algebraic-sub-zero-4.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 63f3cd08162..63eae840c27 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1336,12 +1336,12 @@ fs_visitor::assign_curb_setup()
       for (unsigned int i = 0; i < 3; i++) {
 	 if (inst->src[i].file == UNIFORM) {
 	    int constant_nr = inst->src[i].hw_reg + inst->src[i].reg_offset;
-	    struct brw_reg brw_reg;
+	    struct brw_reg brw_reg = brw_vec1_grf(c->prog_data.first_curbe_grf +
+						  constant_nr / 8,
+						  constant_nr % 8);
 
-	    brw_reg = brw_vec1_grf(c->prog_data.first_curbe_grf +
-				   constant_nr / 8,
-				   constant_nr % 8);
-	    inst->src[i] = fs_reg(brw_reg);
+	    inst->src[i].file = FIXED_HW_REG;
+	    inst->src[i].fixed_hw_reg = brw_reg;
 	 }
       }
    }