diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-29 20:46:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-29 20:46:21 +0200 |
| commit | 816a5430313e07083c5325f0a430126a2e10ec41 (patch) | |
| tree | 82e47992f52149b83238690062e0c56202cb2ebb /mesalib/src/glsl/link_varyings.cpp | |
| parent | c2dfa0e8c98b06e050c530d704d75a7e4edad02e (diff) | |
| download | vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.gz vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.tar.bz2 vcxsrv-816a5430313e07083c5325f0a430126a2e10ec41.zip | |
mesa xkeyboard-config git update 29 Mar 2014
xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e
mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
Diffstat (limited to 'mesalib/src/glsl/link_varyings.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_varyings.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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", |