[Mesa-dev] [PATCH] mesa: the function name appears to have a gl prefix already

[Brian Paul]

On 04/24/2015 05:36 PM, Ilia Mirkin wrote:
> Currently we're producing errors like
>
> User error: GL_INVALID_OPERATION in glglDeleteProgramsARB(invalid call)
>
> And noop_warn appears to be called with the full function name. Don't
> prepend a gl prefix.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>   src/mesa/main/context.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
> index adf6497..6047cdf 100644
> --- a/src/mesa/main/context.c
> +++ b/src/mesa/main/context.c
> @@ -894,14 +894,14 @@ update_default_objects(struct gl_context *ctx)
>    * If there's no current OpenGL context for the calling thread, we can
>    * print a message to stderr.
>    *
> - * \param name  the name of the OpenGL function, without the "gl" prefix
> + * \param name  the name of the OpenGL function
>    */
>   static void
>   nop_handler(const char *name)
>   {
>      GET_CURRENT_CONTEXT(ctx);
>      if (ctx) {
> -      _mesa_error(ctx, GL_INVALID_OPERATION, "gl%s(invalid call)", name);
> +      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid call)", name);
>      }
>   #if defined(DEBUG)
>      else if (getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) {
>

Reviewed-by: Brian Paul <brianp at vmware.com>