diff options
| author | Brian <brian@yutani.localnet.net> | 2007-04-18 16:27:35 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-04-18 17:14:13 -0600 |
| commit | c93e883b205a679aa80f6228459890f9118ad909 (patch) | |
| tree | f9e8290d6c013e7e3086a8c53bf436fe33c57824 /src/mesa/shader/shader_api.c | |
| parent | 274ac7a801766a0ae766219ec6a40ed52e479d07 (diff) | |
Start fixing some issues with uniform variables and their types.
Diffstat (limited to 'src/mesa/shader/shader_api.c')
| -rw-r--r-- | src/mesa/shader/shader_api.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index 74bdef061b..418ef5c723 100644 --- a/src/mesa/shader/shader_api.c +++ b/src/mesa/shader/shader_api.c @@ -638,12 +638,8 @@ _mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLchar *nameOut) { - static const GLenum vec_types[] = { - GL_FLOAT, GL_FLOAT_VEC2, GL_FLOAT_VEC3, GL_FLOAT_VEC4 - }; struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, program); - GLint sz; GLuint ind, j; if (!shProg) { @@ -664,11 +660,10 @@ _mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index, /* found it */ copy_string(nameOut, maxLength, length, shProg->Uniforms->Parameters[j].Name); - sz = shProg->Uniforms->Parameters[j].Size; if (size) - *size = sz; + *size = shProg->Uniforms->Parameters[j].Size; if (type) - *type = vec_types[sz-1]; /* XXX this is a temporary hack */ + *type = shProg->Uniforms->Parameters[j].DataType; return; } ind++; |