summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2010-09-01 13:12:10 -0700
committerKenneth Graunke <kenneth@whitecape.org>2010-09-07 17:30:38 -0700
commitb4ec3f268c4a81c4b9047813423bdf49f0cb1cb5 (patch)
tree8f4a88e3285b9ec43bb19dd8f8c672055dc9588c /src
parent883ac22810578c82f76ae3d4f02dfdc5d5c2e8fe (diff)
ast_to_hir: Allow matrix-from-matrix constructors in GLSL ES.
Everything but 1.10 supports this, so just change the check to ==.
Diffstat (limited to 'src')
-rw-r--r--src/glsl/ast_function.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 61012b850a..5d9d35b2d9 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",