projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
883ac22
)
ast_to_hir: Allow matrix-from-matrix constructors in GLSL ES.
author
Kenneth Graunke
<kenneth@whitecape.org>
Wed, 1 Sep 2010 20:12:10 +0000
(13:12 -0700)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Wed, 8 Sep 2010 00:30:38 +0000
(17:30 -0700)
Everything but 1.10 supports this, so just change the check to ==.
src/glsl/ast_function.cpp
patch
|
blob
|
history
diff --git
a/src/glsl/ast_function.cpp
b/src/glsl/ast_function.cpp
index 61012b850ae0b7fe3963a5f2abc19e168dbb636a..5d9d35b2d9b0058a4406537927aad98b2bc454c9 100644
(file)
--- 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",