Mesa (master): ast_to_hir: Allow matrix-from-matrix constructors in GLSL ES .

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: b4ec3f268c4a81c4b9047813423bdf49f0cb1cb5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4ec3f268c4a81c4b9047813423bdf49f0cb1cb5

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Sep  1 13:12:10 2010 -0700

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

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

---

 src/glsl/ast_function.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 61012b8..5d9d35b 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",