diff options
author | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
commit | 29d27229a95837d085db785a2b4abb654457dafa (patch) | |
tree | 0a03c9dbe3e55fa9676137750da1ee465379b978 /src/mesa/shader/prog_parameter.c | |
parent | fd56bee6c4de28da194333f93b52c40f1deb6163 (diff) | |
parent | 940ca2e837efe45caae1cf1d9665f6736347705d (diff) |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/mesa/shader/prog_parameter.c')
-rw-r--r-- | src/mesa/shader/prog_parameter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c index 6b9e73b2cb..2f029b02e5 100644 --- a/src/mesa/shader/prog_parameter.c +++ b/src/mesa/shader/prog_parameter.c @@ -100,6 +100,7 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList) * \param type type of parameter, such as * \param name the parameter name, will be duplicated/copied! * \param size number of elements in 'values' vector (1..4, or more) + * \param datatype GL_FLOAT, GL_FLOAT_VECx, GL_INT, GL_INT_VECx or GL_NONE. * \param values initial parameter value, up to 4 GLfloats, or NULL * \param state state indexes, or NULL * \return index of new parameter in the list, or -1 if error (out of mem) |