From b4ec3f268c4a81c4b9047813423bdf49f0cb1cb5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 1 Sep 2010 13:12:10 -0700 Subject: 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 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl') 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", -- cgit v1.2.3