diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-20 11:34:36 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-05-20 11:34:36 -0600 |
| commit | 0a95f203fa6de3ed05c93e6788c7e2fdca170c94 (patch) | |
| tree | 42531f29eb96ed673c26d088247ef806f5717746 /src/mesa/shader/prog_parameter.h | |
| parent | de03e8e9604afd7b61002e8d7e0f94a859734abf (diff) | |
| parent | 34149ec89d71aa550ac4477050fa79d66bb94f25 (diff) | |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
Diffstat (limited to 'src/mesa/shader/prog_parameter.h')
| -rw-r--r-- | src/mesa/shader/prog_parameter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_parameter.h b/src/mesa/shader/prog_parameter.h index d6cc03448c..105f6f24de 100644 --- a/src/mesa/shader/prog_parameter.h +++ b/src/mesa/shader/prog_parameter.h @@ -114,7 +114,7 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList, extern GLint _mesa_add_sampler(struct gl_program_parameter_list *paramList, - const char *name, GLenum datatype, GLuint index); + const char *name, GLenum datatype); extern GLint _mesa_add_varying(struct gl_program_parameter_list *paramList, |