1433081 - [Wayland] Enable to specify GL provider at build time with "--with-gl-provider"

Status: RESOLVED WONTFIX

(Core :: Graphics: CanvasWebGL, enhancement, P3)

Description

[Martin Stránský [:stransky] (ni? me)]

--with-gl-provider option is broken right now and we need that to provide Wayland/EGL enabled build.

Comment 1

[Martin Stránský [:stransky] (ni? me)]

Attachment: patch

WIP patch

Comment 2

[Martin Stránský [:stransky] (ni? me)]

Attachment: Bug 1433081 - Don't try to build different GL backends when MOZ_GL_PROVIDER is set,

--with-gl-provider build option is recently broken as we try to build different GL backends
regardless the MOZ_GL_PROVIDER variable. With this patch when --with-gl-provider is gived we build
the specified GL backend only.

It aims primary to Wayland on Gtk/Linux where GLX is default and we need to explicitly
build against EGL.

Review commit: https://reviewboard.mozilla.org/r/216718/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/216718/

Comment 3

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 8946797 [details]
Bug 1433081 - Don't try to build different GL backends when MOZ_GL_PROVIDER is set,

punting to jgilbert

Comment 5

[Martin Stránský [:stransky] (ni? me)]

We don't depend on Wayland any more as Bug 1434574 lands. But it's really easy to to make gl-provider work again.

Comment 6

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8946797 [details]
Bug 1433081 - Don't try to build different GL backends when MOZ_GL_PROVIDER is set,

https://reviewboard.mozilla.org/r/216718/#review224052

::: gfx/gl/GLContextProvider.h:29
(Diff revision 1)
>  // Null is always there
>  #define GL_CONTEXT_PROVIDER_NAME GLContextProviderNull
>  #include "GLContextProviderImpl.h"
>  #undef GL_CONTEXT_PROVIDER_NAME
>  
> +#if !defined(MOZ_GL_PROVIDER)

#ifndef

::: gfx/gl/GLContextProvider.h:69
(Diff revision 1)
>  #ifndef GL_CONTEXT_PROVIDER_DEFAULT
>  #define GL_CONTEXT_PROVIDER_DEFAULT GLContextProviderEAGL
>  #endif
>  #endif
>  
> +#else //defined(MOZ_GL_PROVIDER)

space after //

::: gfx/gl/GLContextProvider.h:72
(Diff revision 1)
>  #endif
>  
> +#else //defined(MOZ_GL_PROVIDER)
> +
>  #ifdef MOZ_GL_PROVIDER
>    #define GL_CONTEXT_PROVIDER_NAME MOZ_GL_PROVIDER

Just move this whole block above the other blocks, so we hit MOZ_GL_PROVIDER first.

Comment 7

[Martin Stránský [:stransky] (ni? me)]

Comment on attachment 8946797 [details]
Bug 1433081 - Don't try to build different GL backends when MOZ_GL_PROVIDER is set,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/216718/diff/1-2/

Comment 8

[Martin Stránský [:stransky] (ni? me)]

Comment on attachment 8946797 [details]
Bug 1433081 - Don't try to build different GL backends when MOZ_GL_PROVIDER is set,

https://reviewboard.mozilla.org/r/216718/#review224052

> #ifndef

I actually used the leading "#ifdef MOZ_GL_PROVIDER" here.

Comment 9

[Martin Stránský [:stransky] (ni? me)]

I don't think we need that now.