From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 25 Oct 2010 19:44:55 +0000 (-0700)
Subject: glsl: Fix constant component count in vector constructor emitting.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba2382f50d7815947e17fe993b39feb573638d12;p=mesa.git

glsl: Fix constant component count in vector constructor emitting.

Fixes freedesktop.org bug #31101 as well as piglit test cases
assignment-type-mismatch.vert and constructor-28.vert.
---

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 20448f5a975..e31f79926de 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -545,7 +545,7 @@ emit_inline_vector_constructor(const glsl_type *type,
 	    /* Mask of fields to be written in the assignment.
 	     */
 	    constant_mask |= ((1U << rhs_components) - 1) << base_lhs_component;
-	    constant_components++;
+	    constant_components += rhs_components;
 
 	    base_component += rhs_components;
 	 }