From 816a5430313e07083c5325f0a430126a2e10ec41 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 29 May 2014 20:46:21 +0200 Subject: mesa xkeyboard-config git update 29 Mar 2014 xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e mesa commit dfd117b8570a69a429e660c069997e78b181ab6d --- mesalib/src/glsl/link_varyings.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesalib/src/glsl/link_varyings.cpp') diff --git a/mesalib/src/glsl/link_varyings.cpp b/mesalib/src/glsl/link_varyings.cpp index 71998dfa9..686329857 100644 --- a/mesalib/src/glsl/link_varyings.cpp +++ b/mesalib/src/glsl/link_varyings.cpp @@ -77,8 +77,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog, * correspondence between the vertex language and the * fragment language." */ - if (!output->type->is_array() - || (strncmp("gl_", output->name, 3) != 0)) { + if (!output->type->is_array() || !is_gl_identifier(output->name)) { linker_error(prog, "%s shader output `%s' declared as type `%s', " "but %s shader input declared as type `%s'\n", -- cgit v1.2.3