From ae2a03b5736037128fb071595717f300d5b3afd5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 8 Apr 2014 16:55:23 -0700 Subject: [PATCH] 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" Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/glsl/opt_vectorize.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/glsl/opt_vectorize.cpp b/src/glsl/opt_vectorize.cpp index 3306397fd3a..f9a3b618345 100644 --- a/src/glsl/opt_vectorize.cpp +++ b/src/glsl/opt_vectorize.cpp @@ -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(); -- 2.30.2