summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-08-05 16:31:30 -0700
committerEric Anholt <[email protected]>2011-08-16 13:04:41 -0700
commit82aa9299fbfe92d2526fa9f7ffd2a1ebc7827ee9 (patch)
treed83af0d492438bf70696a2fb916766fc427ef1d5
parentc0f334a3ed3c6645abd1812e39cd52f1dfa32fa1 (diff)
i965/vs: Allow scalar values in assignments, too.
Fixes glsl-vs-all-02 and many other tests.
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
index c4a3c8a8667..e3779ab0444 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
@@ -1285,7 +1285,8 @@ vec4_visitor::visit(ir_assignment *ir)
int first_enabled_chan = 0;
int src_chan = 0;
- assert(ir->lhs->type->is_vector());
+ assert(ir->lhs->type->is_vector() ||
+ ir->lhs->type->is_scalar());
dst.writemask = ir->write_mask;
for (int i = 0; i < 4; i++) {