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 63f3cd08162040e571d5bac02d4f434883f5ffe8..63eae840c2769e69f548f9e8374dd71eb764d57f 100644 (file)
--- 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;
         }
       }
    }