diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-10 12:33:17 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-06 08:39:06 -0700 |
| commit | 6b05708ce2c4120921f43d82f1751e039306e0d6 (patch) | |
| tree | 700d9da432f136714c1f53ab50fe933f466b7684 /src/mesa/shader/prog_parameter.c | |
| parent | de445478915af41e1e078cbb8c2cbcce340f83b6 (diff) | |
mesa: track initialization status of uniform variables. Plus, asst clean-ups.
(cherry picked from commit 2d76a0d77af7be9539f89cba37ce84338c1cdda4)
Diffstat (limited to 'src/mesa/shader/prog_parameter.c')
| -rw-r--r-- | src/mesa/shader/prog_parameter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c index bfe27d2f63..e1729c7bff 100644 --- a/src/mesa/shader/prog_parameter.c +++ b/src/mesa/shader/prog_parameter.c @@ -128,6 +128,7 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList, if (values) { COPY_4V(paramList->ParameterValues[oldNum + i], values); values += 4; + p->Initialized = GL_TRUE; } else { /* silence valgrind */ @@ -259,7 +260,8 @@ _mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList, */ GLint _mesa_add_uniform(struct gl_program_parameter_list *paramList, - const char *name, GLuint size, GLenum datatype) + const char *name, GLuint size, GLenum datatype, + const GLfloat *values) { GLint i = _mesa_lookup_parameter_index(paramList, -1, name); ASSERT(datatype != GL_NONE); @@ -271,7 +273,7 @@ _mesa_add_uniform(struct gl_program_parameter_list *paramList, } else { i = _mesa_add_parameter(paramList, PROGRAM_UNIFORM, name, - size, datatype, NULL, NULL); + size, datatype, values, NULL); return i; } } |