diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-18 08:02:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-18 08:04:01 +0300 |
| commit | 554277986d415dc62496942fb30838558a8c449d (patch) | |
| tree | 842c382746df6597a7511d12106e6cf4b704c0fc /intern | |
| parent | 16e929e6ff1007d057d183b56bb7fc2d1f8aae53 (diff) | |
Gawain: fix missing NULL check
Also shadowed variable warning
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/gawain/src/shader_interface.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/gawain/src/shader_interface.c b/intern/gawain/src/shader_interface.c index fe175d5e45b..2d0eb353aaf 100644 --- a/intern/gawain/src/shader_interface.c +++ b/intern/gawain/src/shader_interface.c @@ -209,8 +209,8 @@ ShaderInterface* ShaderInterface_create(GLint program) if (delta) { // each input->name will need adjustment (except static built-in names) - const uint32_t input_ct = shaderface->uniform_ct + shaderface->attrib_ct; - for (uint32_t i = 0; i < input_ct; ++i) + const uint32_t input_ct_new = shaderface->uniform_ct + shaderface->attrib_ct; + for (uint32_t i = 0; i < input_ct_new; ++i) { ShaderInput* input = shaderface->inputs + i; @@ -252,6 +252,9 @@ const ShaderInput* ShaderInterface_uniform(const ShaderInterface* shaderface, co { const ShaderInput* uniform = shaderface->inputs + i; +#if SUPPORT_LEGACY_GLSL + if (uniform->name == NULL) continue; +#endif if (uniform->builtin_type != UNIFORM_CUSTOM) if (match(uniform->name, name)) return uniform; |