diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-29 08:51:48 +0200 |
| commit | 04f3d1515878e535b7e3876264eaa4d43a1e6d54 (patch) | |
| tree | 58867d9fa0097be91f1717a693a7ca4b3eb77d71 /mesalib/src/glsl/ast_function.cpp | |
| parent | ff986553659472cf191804eadb13c21e8f2b44c0 (diff) | |
| parent | 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a (diff) | |
| download | vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.gz vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.tar.bz2 vcxsrv-04f3d1515878e535b7e3876264eaa4d43a1e6d54.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver git update 29 July 2013
Diffstat (limited to 'mesalib/src/glsl/ast_function.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_function.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp index e34c1ddba..7df2b6925 100644 --- a/mesalib/src/glsl/ast_function.cpp +++ b/mesalib/src/glsl/ast_function.cpp @@ -626,7 +626,7 @@ process_vec_mat_constructor(exec_list *instructions, * int i = { 1 }; // illegal, i is not an aggregate" */ if (constructor_type->vector_elements <= 1) { - _mesa_glsl_error(loc, state, "Aggregates can only initialize vectors, " + _mesa_glsl_error(loc, state, "aggregates can only initialize vectors, " "matrices, arrays, and structs"); return ir_rvalue::error_value(ctx); } |