summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-27 14:15:42 -0700
committerEric Anholt <eric@anholt.net>2010-08-27 14:42:35 -0700
commitd20c2766182b632fba296eff7328bf14c802096e (patch)
treef5e4d65cdbfceeb3e64b01c8cdfd7b97d9b31164 /src/mesa/drivers/dri
parentf0aa2d6118b1af7434b7551227cd72c588568e65 (diff)
i965: Don't strip negate/abs flags when assigning uniform locations.
Fixes glsl-algebraic-sub-zero-4.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 63f3cd0816..63eae840c2 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;
}
}
}