diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-11 14:42:41 -0700 |
| commit | 19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch) | |
| tree | 5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /src/mesa/shader/prog_uniform.h | |
| parent | 7f3d45758ccbbcff6428d57d26794960e3e9532c (diff) | |
| parent | 90246d3ea54f54d60593dce1b89f0226058a3c56 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/prog_execute.c
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'src/mesa/shader/prog_uniform.h')
| -rw-r--r-- | src/mesa/shader/prog_uniform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_uniform.h b/src/mesa/shader/prog_uniform.h index deea732991..22a2bfd970 100644 --- a/src/mesa/shader/prog_uniform.h +++ b/src/mesa/shader/prog_uniform.h @@ -75,7 +75,7 @@ _mesa_new_uniform_list(void); extern void _mesa_free_uniform_list(struct gl_uniform_list *list); -extern GLboolean +extern struct gl_uniform * _mesa_append_uniform(struct gl_uniform_list *list, const char *name, GLenum target, GLuint progPos); |