From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 20 Jul 2010 10:53:47 +0000 (-0700)
Subject: ast_to_hir: Fix bug in constant initializers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1d71850faba23d1bea3858a8c2e05a45fd21143;p=mesa.git

ast_to_hir: Fix bug in constant initializers.

Implicit conversions were not being performed, nor was there any
type checking - it was possible to have, say, var->type == float
and var->constant_value->type == int.  Later use of the constant
expression would trigger an assertion.

Fixes piglit test const-implicit-conversion.frag.
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index e9257eee289..99a2183cf86 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1804,6 +1804,16 @@ ast_declarator_list::hir(exec_list *instructions,
 	  * declaration.
 	  */
 	 if (this->type->qualifier.constant || this->type->qualifier.uniform) {
+	    ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);
+	    if (new_rhs != NULL) {
+	       rhs = new_rhs;
+	    } else {
+	       _mesa_glsl_error(&initializer_loc, state,
+			        "initializer of type %s cannot be assigned to "
+				"variable of type %s",
+				rhs->type->name, var->type->name);
+	    }
+
 	    ir_constant *constant_value = rhs->constant_expression_value();
 	    if (!constant_value) {
 	       _mesa_glsl_error(& initializer_loc, state,