From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 1 Sep 2010 20:12:10 +0000 (-0700)
Subject: ast_to_hir: Allow matrix-from-matrix constructors in GLSL ES.
X-Git-Tag: android-x86-2.2~1392
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b4ec3f268c4a81c4b9047813423bdf49f0cb1cb5;p=android-x86%2Fexternal-mesa.git

ast_to_hir: Allow matrix-from-matrix constructors in GLSL ES.

Everything but 1.10 supports this, so just change the check to ==.
---

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 61012b850ae..5d9d35b2d9b 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -1063,7 +1063,7 @@ ast_function_expression::hir(exec_list *instructions,
        *    "It is an error to construct matrices from other matrices. This
        *    is reserved for future use."
        */
-      if ((state->language_version <= 110) && (matrix_parameters > 0)
+      if (state->language_version == 110 && matrix_parameters > 0
 	  && constructor_type->is_matrix()) {
 	 _mesa_glsl_error(& loc, state, "cannot construct `%s' from a "
 			  "matrix in GLSL 1.10",