diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-12-17 12:13:11 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-12-30 11:21:08 -0800 |
| commit | 26707abe5635e99814603a0f4895865e977cf267 (patch) | |
| tree | be2b80723c8fef82c7cb50f0f290ee3927eb79b5 /src/mesa/main/uniform_query.cpp | |
| parent | f425d56ba41382be04366d011536ee78a03a2f33 (diff) | |
| download | external_mesa3d-26707abe5635e99814603a0f4895865e977cf267.zip external_mesa3d-26707abe5635e99814603a0f4895865e977cf267.tar.gz external_mesa3d-26707abe5635e99814603a0f4895865e977cf267.tar.bz2 | |
Rename overloads of _mesa_glsl_shader_target_name().
Previously, _mesa_glsl_shader_target_name() had an overload for GLenum
and an overload for the gl_shader_type enum, each of which behaved
differently. However, since GLenum is a synonym for unsigned int, and
unsigned ints are often used in place of gl_shader_type (e.g. in loop
indices), there was a big risk of calling the wrong overload by
mistake. This patch gives the two overloads different names so that
it's always clear which one we mean to call.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 88ad476..61bcbcb 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -452,7 +452,7 @@ log_program_parameters(const struct gl_shader_program *shProg) const struct gl_program *const prog = shProg->_LinkedShaders[i]->Program; printf("Program %d %s shader parameters:\n", - shProg->Name, _mesa_glsl_shader_target_name(prog->Target)); + shProg->Name, _mesa_shader_enum_to_string(prog->Target)); for (unsigned j = 0; j < prog->Parameters->NumParameters; j++) { printf("%s: %p %f %f %f %f\n", prog->Parameters->Parameters[j].Name, |