KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove unused _mesa_get_uniform_name 

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
This commit is contained in:
Tapani Pälli 2015-03-12 13:53:07 +02:00
parent 8d6fa52e33
commit 284003e1f1
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/mesa/main/uniforms.c
View File

@ -1230,45 +1230,6 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex,
length, uniformName, "glGetActiveUniformName");
}
void
_mesa_get_uniform_name(const struct gl_uniform_storage *uni,
GLsizei maxLength, GLsizei *length,
GLchar *nameOut)
{
GLsizei localLength;
if (length == NULL)
length = &localLength;
_mesa_copy_string(nameOut, maxLength, length, uni->name);
/* Page 61 (page 73 of the PDF) in section 2.11 of the OpenGL ES 3.0
* spec says:
*
* "If the active uniform is an array, the uniform name returned in
* name will always be the name of the uniform array appended with
* "[0]"."
*
* The same text also appears in the OpenGL 4.2 spec. It does not,
* however, appear in any previous spec. Previous specifications are
* ambiguous in this regard. However, either name can later be passed
* to glGetUniformLocation (and related APIs), so there shouldn't be any
* harm in always appending "[0]" to uniform array names.
*/
if (uni->array_elements != 0) {
int i;
/* The comparison is strange because *length does *NOT* include the
* terminating NUL, but maxLength does.
*/
for (i = 0; i < 3 && (*length + i + 1) < maxLength; i++)
nameOut[*length + i] = "[0]"[i];
nameOut[*length + i] = '\0';
*length += i;
}
}
void GLAPIENTRY
_mesa_GetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex,
GLenum pname, GLint *params)

5
src/mesa/main/uniforms.h
View File

@ -398,11 +398,6 @@ _mesa_sampler_uniforms_pipeline_are_valid(struct gl_pipeline_object *);
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];