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

[Maarten Lankhorst]

Hey,

On 13-01-15 03:40, Eric Anholt wrote:
> 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.
I was getting a null pointer dereference here in libepoxy 1.2, how can I check if it's working as it should?

libepoxy also doesn't work right for tests in ubuntu and fence sync extensions but I've sent you some patches for that.

~Maarten