summaryrefslogtreecommitdiffstats
path: root/src/glsl/link_varyings.cpp
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2014-05-23 14:57:49 -0600
committerBrian Paul <brianp@vmware.com>2014-05-28 15:06:07 -0600
commita7aca3919ba29ccdac01136fa9ba79f571bc797d (patch)
treeb928201cc61db62c36225acf129df4bed3754415 /src/glsl/link_varyings.cpp
parentf9cecca7a6e3d9ff231075381b88d179e153a5a4 (diff)
downloadexternal_mesa3d-a7aca3919ba29ccdac01136fa9ba79f571bc797d.zip
external_mesa3d-a7aca3919ba29ccdac01136fa9ba79f571bc797d.tar.gz
external_mesa3d-a7aca3919ba29ccdac01136fa9ba79f571bc797d.tar.bz2
glsl: replace strncmp("gl_") calls with new is_gl_identifier() helper
Makes things a little easier to read. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/link_varyings.cpp')
-rw-r--r--src/glsl/link_varyings.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 71998df..6863298 100644
--- a/src/glsl/link_varyings.cpp
+++ b/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",