From 4c8cee9b5a37db30af50aafcbf54b36b9fd9e03a Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 29 Jul 2013 08:50:02 +0200 Subject: libX11 mesa xserver git update 29 July 2013 xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf mesa commit e847b5ae066bf9a209dad482fcc664f944983633 --- mesalib/src/glsl/ast_function.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesalib/src/glsl/ast_function.cpp') 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); } -- cgit v1.2.3