diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-14 11:27:51 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-14 11:27:51 -0600 |
| commit | d09a19bf6e09eb0c8908e9b5378962ac17bcbc4c (patch) | |
| tree | dde75617a85679ebd80b3d86e7f2889203c8da24 /src/mesa/shader | |
| parent | db598b899868ba6db8f3f525a22a45331589592e (diff) | |
| parent | 1574b05189fee1b5802024b505ba93fff345e95c (diff) | |
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/shader_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index 9cfc6dd81c..cf0a902389 100644 --- a/src/mesa/shader/shader_api.c +++ b/src/mesa/shader/shader_api.c @@ -885,7 +885,7 @@ _mesa_get_active_attrib(GLcontext *ctx, GLuint program, GLuint index, static struct gl_program_parameter * get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index) { - const struct gl_program *prog; + const struct gl_program *prog = NULL; GLint progPos; progPos = shProg->Uniforms->Uniforms[index].VertPos; @@ -915,7 +915,7 @@ _mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index, GLenum *type, GLchar *nameOut) { const struct gl_shader_program *shProg; - const struct gl_program *prog; + const struct gl_program *prog = NULL; const struct gl_program_parameter *param; GLint progPos; |