[PATCH] clients/nested: Fix compilation

Armin K. krejzi at email.com
Tue Jun 4 04:31:44 PDT 2013


On 06/04/2013 01:19 PM, Armin K. wrote:
> On 06/04/2013 01:19 PM, sardemff7+wayland at sardemff7.net wrote:
>> On 04/06/2013 13:05, Armin K wrote:
>>> diff --git a/clients/nested.c b/clients/nested.c
>>> index baaff64..132724d 100644
>>> --- a/clients/nested.c
>>> +++ b/clients/nested.c
>>> @@ -34,8 +34,11 @@
>>>
>>>   #include <EGL/egl.h>
>>>   #include <EGL/eglext.h>
>>> +
>>> +#ifdef USE_CAIRO_GLESV2
>>>   #include <GLES2/gl2.h>
>>>   #include <GLES2/gl2ext.h>
>>> +#endif /* USE_CAIRO_GLESV2 */
>>>
>>>   #include <cairo-gl.h>
>>>
>>
>> Are you sure the nested client work with desktop GL then?
>>
>>
>
> I think that this needs to be ported to GLESv2 first, since the example
> calls cairo_gl_surface_create_for_texture which is GL only function (I
> guess). Includes could've been removed without any problem.

Erm, cairo-gl.h is shared among cairo-gl and cairo-glesv2 and the 
function cairo_gl_surface_create_for_texture isn't Desktop OpenGL 
specific. But since cairo-gl pulls gl (look at cairo-gl.pc), it pulls 
its includes and you will probably get the error. But, if you build 
cairo with GLESv2 support, it will look for cairo-gles2.pc and won't 
reference desktop opengl includes.



More information about the wayland-devel mailing list