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_uniforms.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_uniforms.cpp')
| -rw-r--r-- | mesalib/src/glsl/link_uniforms.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index c7147e0ee..ba66053ed 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -848,7 +848,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) /* FINISHME: Update code to process built-in uniforms! */ - if (strncmp("gl_", var->name, 3) == 0) { + if (is_gl_identifier(var->name)) { uniform_size.num_shader_uniform_components += var->type->component_slots(); continue; @@ -900,7 +900,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) /* FINISHME: Update code to process built-in uniforms! */ - if (strncmp("gl_", var->name, 3) == 0) + if (is_gl_identifier(var->name)) continue; parcel.set_and_process(prog, var); |