[PATCH 2/7] glamor: glObjectLabel is not defined in GLES2

[Eric Anholt]

Maarten Lankhorst <maarten.lankhorst at ubuntu.com> writes:

> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at ubuntu.com>
> ---
>  glamor/glamor_core.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
> index 737b274..4eaf8ac 100644
> --- a/glamor/glamor_core.c
> +++ b/glamor/glamor_core.c
> @@ -102,7 +102,8 @@ glamor_link_glsl_prog(ScreenPtr screen, GLint prog, const char *format, ...)
>          FatalError("GLSL link failure\n");
>      }
>  
> -    if (glamor_priv->has_khr_debug) {
> +    if (glamor_priv->has_khr_debug &&
> +        (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP)) {
>          char *label;
>          va_list va;

On ES2, glObjectLabelKHR() should exist instead of glObjectLabel(), and
epoxy should be aliasing the two.  We should fix epoxy if it's not
working.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150113/d1c2aba7/attachment.sig>