diff options
| author | Ben Skeggs <[email protected]> | 2008-06-29 12:16:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-06-29 12:16:13 +1000 |
| commit | 01de2293d5449ab6ca1d99b007c9ea4f0037fef5 (patch) | |
| tree | 8560aab576c3d8504f8d7935ab6fcd46ea35182e /src/mesa/shader/prog_uniform.c | |
| parent | b831aa06dc0d099185bcaa180683ad10942feaa0 (diff) | |
| parent | 9d94d133b019ef23ee03cc691fcb5602451604ae (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/shader/prog_uniform.c')
| -rw-r--r-- | src/mesa/shader/prog_uniform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c index d96a916533b..f57df3d86dc 100644 --- a/src/mesa/shader/prog_uniform.c +++ b/src/mesa/shader/prog_uniform.c @@ -119,7 +119,7 @@ GLint _mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name) { GLuint i; - for (i = 0; i < list->NumUniforms; i++) { + for (i = 0; list && i < list->NumUniforms; i++) { if (!_mesa_strcmp(list->Uniforms[i].Name, name)) { return i; } @@ -133,7 +133,7 @@ _mesa_longest_uniform_name(const struct gl_uniform_list *list) { GLint max = 0; GLuint i; - for (i = 0; i < list->NumUniforms; i++) { + for (i = 0; list && i < list->NumUniforms; i++) { GLuint len = _mesa_strlen(list->Uniforms[i].Name); if (len > (GLuint)max) max = len; |