[Mesa-dev] [PATCH] mesa: Add support for glGetProgramiv pnames for UBOs.

[Brian Paul]

On 07/26/2012 10:24 AM, Eric Anholt wrote:
> Fixes piglit ARB_uniform_buffer_object/getprogramiv.
>
> v2: Add extension checks.
> ---
>
> Since there were only two cases, I didn't use goto on this patch.
>
>   src/mesa/main/shaderapi.c |   29 +++++++++++++++++++++++++++++
>   1 file changed, 29 insertions(+)
>
> diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
> index 7c97a63..9926c08 100644
> --- a/src/mesa/main/shaderapi.c
> +++ b/src/mesa/main/shaderapi.c
> @@ -544,6 +544,35 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
>         *params = shProg->Geom.OutputType;
>         break;
>   #endif
> +   case GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH: {
> +      if (!ctx->Extensions.ARB_uniform_buffer_object) {
> +         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
> +         return;
> +      }
> +
> +      unsigned i;
> +      GLint max_len = 0;

Declarations after code will blow up with MSVC.


> +      for (i = 0; i<  shProg->NumUniformBlocks; i++) {
> +	 /* Add one for the terminating NUL character.
> +	  */
> +	 const GLint len = strlen(shProg->UniformBlocks[i].Name) + 1;
> +
> +	 if (len>  max_len)
> +	    max_len = len;
> +      }
> +
> +      *params = max_len;
> +      break;
> +   }
> +   case GL_ACTIVE_UNIFORM_BLOCKS:
> +      if (!ctx->Extensions.ARB_uniform_buffer_object) {
> +         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
> +         return;
> +      }
> +
> +      *params = shProg->NumUniformBlocks;
> +      break;
>      default:
>         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
>         return;