glsl: Try vectorizing when seeing a repeated assignment to a channel.
When considering assignment expressions like: v.x += u.x; v.x += u.x; the vectorizer would incorrectly keep going, attempting to find more instructions to vectorize. It would overwrite the saved assignment to point at the second one, and increment channels a second time, resulting in try_vectorize thinking the expression was a vec2 instead of a float. Instead, if we see a repeated assignment to a channel, just try to vectorize everything we've found so far. This clears the saved state so it will start over. Fixes Piglit's repeated-channel-assignments.vert. Cc: "10.1" <mesa-stable@lists.freedesktop.org> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
parent
625cf8c874
commit
ae2a03b573
|
@ -260,6 +260,7 @@ ir_vectorize_visitor::visit_enter(ir_assignment *ir)
|
|||
if (ir->condition ||
|
||||
this->channels >= 4 ||
|
||||
!single_channel_write_mask(ir->write_mask) ||
|
||||
this->assignment[write_mask_to_swizzle(ir->write_mask)] != NULL ||
|
||||
(lhs && !ir->lhs->equals(lhs)) ||
|
||||
(rhs && !ir->rhs->equals(rhs, ir_type_swizzle))) {
|
||||
try_vectorize();
|
||||
|
|
Loading…
Reference in New Issue