[Mesa-dev] [PATCH v2 24/24] mesa: refactor GetUniformBlockIndex

[Martin Peres]

On 01/04/15 15:14, Tapani Pälli wrote:
> Use _mesa_program_resource_index to get index.
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>   src/mesa/main/uniforms.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
> index f4de1df..5548d1d 100644
> --- a/src/mesa/main/uniforms.c
> +++ b/src/mesa/main/uniforms.c
> @@ -938,7 +938,6 @@ _mesa_GetUniformBlockIndex(GLuint program,
>   			   const GLchar *uniformBlockName)
>   {
>      GET_CURRENT_CONTEXT(ctx);
> -   GLuint i;
>      struct gl_shader_program *shProg;
>   
>      if (!ctx->Extensions.ARB_uniform_buffer_object) {
> @@ -951,12 +950,13 @@ _mesa_GetUniformBlockIndex(GLuint program,
>      if (!shProg)
>         return GL_INVALID_INDEX;
>   
> -   for (i = 0; i < shProg->NumUniformBlocks; i++) {
> -      if (!strcmp(shProg->UniformBlocks[i].Name, uniformBlockName))
> -	 return i;
> -   }
> +   struct gl_program_resource *res =
> +      _mesa_program_resource_find_name(shProg, GL_UNIFORM_BLOCK,
> +                                       uniformBlockName);
> +   if (!res)
> +      return GL_INVALID_INDEX;
>   
> -   return GL_INVALID_INDEX;
> +   return _mesa_program_resource_index(shProg, res);
>   }
>   
>   void GLAPIENTRY

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