diff options
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.c | 12 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index efff8f381f1..ec08ed48b40 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -59,7 +59,7 @@ _mesa_GetActiveUniform(GLhandleARB program, GLuint index, const struct gl_uniform_storage *const uni = &shProg->UniformStorage[index]; if (nameOut) { - _mesa_copy_string(nameOut, maxLength, length, uni->name); + _mesa_get_uniform_name(uni, maxLength, length, nameOut); } if (size) { diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 77b195edbc3..edb44777f6b 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -795,7 +795,15 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, } if (uniformName) { - _mesa_copy_string(uniformName, bufSize, length, - shProg->UniformStorage[uniformIndex].name); + _mesa_get_uniform_name(& shProg->UniformStorage[uniformIndex], + bufSize, length, uniformName); } } + +void +_mesa_get_uniform_name(const struct gl_uniform_storage *uni, + GLsizei maxLength, GLsizei *length, + GLchar *nameOut) +{ + _mesa_copy_string(nameOut, maxLength, length, uni->name); +} diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 287d7106bb6..f17503121c8 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -213,6 +213,11 @@ _mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg, extern const struct gl_program_parameter * get_uniform_parameter(struct gl_shader_program *shProg, GLint index); +extern void +_mesa_get_uniform_name(const struct gl_uniform_storage *uni, + GLsizei maxLength, GLsizei *length, + GLchar *nameOut); + struct gl_builtin_uniform_element { const char *field; int tokens[STATE_LENGTH]; |