diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 08:30:07 +0100 |
| commit | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (patch) | |
| tree | 063ea788b90cc200b84b40ce431a7649045de907 /mesalib/src/glsl/ast_to_hir.cpp | |
| parent | 697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (diff) | |
| download | vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.gz vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.tar.bz2 vcxsrv-a473b885d641b9c1ea57f2ae53f9ba7f2958cce2.zip | |
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
xserver commit 80481267662c8687e73081237913fa561e7a6561
libX11 commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4
libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909
mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b
libXmu commit e02c30fac32e4873240e507cadc416f710188feb
mesa commit 72cae2a599881e926b8709f4dfa2cc3591ea7a02
Diffstat (limited to 'mesalib/src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_to_hir.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 01280478c..43cf49745 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -696,9 +696,15 @@ validate_assignment(struct _mesa_glsl_parse_state *state, * Note: Whole-array assignments are not permitted in GLSL 1.10, but this * is handled by ir_dereference::is_lvalue. */ - if (is_initializer && lhs_type->is_unsized_array() && rhs->type->is_array() + if (lhs_type->is_unsized_array() && rhs->type->is_array() && (lhs_type->element_type() == rhs->type->element_type())) { - return rhs; + if (is_initializer) { + return rhs; + } else { + _mesa_glsl_error(&loc, state, + "implicitly sized arrays cannot be assigned"); + return NULL; + } } /* Check for implicit conversion in GLSL 1.20 */ |