diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2015-03-12 13:22:16 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-04-16 07:55:57 +0300 |
| commit | 8d6fa52e33183942fe93e2fad27bf4881b0a1ce0 (patch) | |
| tree | aa1538ea140dac404a61efb45d5ff7c21a518d19 /src/mesa/main/uniforms.c | |
| parent | 17dc939f756cfed23574ad84764f5e2a5a9b6751 (diff) | |
| download | external_mesa3d-8d6fa52e33183942fe93e2fad27bf4881b0a1ce0.zip external_mesa3d-8d6fa52e33183942fe93e2fad27bf4881b0a1ce0.tar.gz external_mesa3d-8d6fa52e33183942fe93e2fad27bf4881b0a1ce0.tar.bz2 | |
mesa: refactor GetActiveUniformName
Use _mesa_get_program_resource_name to get name.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Diffstat (limited to 'src/mesa/main/uniforms.c')
| -rw-r--r-- | src/mesa/main/uniforms.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index dc9b5a0..69f8a3f 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1226,15 +1226,8 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, if (!shProg) return; - if (uniformIndex >= shProg->NumUserUniformStorage) { - _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniform(index)"); - return; - } - - if (uniformName) { - _mesa_get_uniform_name(& shProg->UniformStorage[uniformIndex], - bufSize, length, uniformName); - } + _mesa_get_program_resource_name(shProg, GL_UNIFORM, uniformIndex, bufSize, + length, uniformName, "glGetActiveUniformName"); } void |