[PATCH] clients/nested: Fix compilation

Armin K. krejzi at email.com
Tue Jun 4 04:45:00 PDT 2013


On 06/04/2013 01:36 PM, sardemff7+wayland at sardemff7.net wrote:
> On 04/06/2013 13:19, 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.
>
>
> Wrong guess, cairo_gl_surface_create_for_texture is provided by either
> cairo-gl or cairo-glesv2 which are using the same code.
>
> If the nested client does not use any GLESv2 (or GL) function, it should
> then work on both. I just wanted to know if you tested with desktop GL,
> since Kristian probably developed with GLESv2.
>

I've corrected myself in another e-mail. Unfortunately, I can't verify 
if it works since I am currently on an old machine (Intel 865 - can't 
initialize EGL), but it does build. I don't see the reason why it 
shouldn't work when Desktop OpenGL is present since other gl demos seem 
to work, too.


More information about the wayland-devel mailing list