[Mesa-dev] [PATCH v2 20/24] mesa: remove unused _mesa_get_uniform_name

[Martin Peres]

On 01/04/15 15:14, Tapani Pälli wrote:
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>   src/mesa/main/uniforms.c | 39 ---------------------------------------
>   src/mesa/main/uniforms.h |  5 -----
>   2 files changed, 44 deletions(-)
>
> diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
> index 69f8a3f..078e433 100644
> --- a/src/mesa/main/uniforms.c
> +++ b/src/mesa/main/uniforms.c
> @@ -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)
> diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
> index 0e6113f..55fa235 100644
> --- a/src/mesa/main/uniforms.h
> +++ b/src/mesa/main/uniforms.h
> @@ -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];

Reviewed-by: Martin Peres <martin.peres at linux.intel.com>