1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code

Status: RESOLVED FIXED

(Core :: Graphics, enhancement, P2)

Description

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

In order to build both Linux GL backend simultaneously (GLX and EGL - Bug 1460255) we can't use just GL_PROVIDER_GLX condition to build X11 GL related code.

So let's replace GL_PROVIDER_GLX by MOZ_X11 to reflect ability to run on X11 backend.

Comment 1

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

Attachment: Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,

In order to have useful Wayland builds we need ability to switch
between GL backends run-time - to use EGL backend for Wayland and GLX backend for X11.

GL_PROVIDER_GLX is used exclusively for GLX GL backend, so let's replace GL_PROVIDER_GLX
build-time check by more general MOZ_X11 check which determines X11 dependent code
and it's valid for both X11 and Wayland builds.

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

Comment 2

[Lee Salzman [:lsalzman]]

Comment on attachment 8980248 [details]
Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,

https://reviewboard.mozilla.org/r/246410/#review252576

::: gfx/thebes/gfxXlibSurface.cpp:28
(Diff revision 1)
>  using namespace mozilla;
>  using namespace mozilla::gfx;
>  
>  gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
>      : mPixmapTaken(false), mDisplay(dpy), mDrawable(drawable)
> -#if defined(GL_PROVIDER_GLX)
> +#if defined(MOZ_X11)

Building of gfxXlibSurface.cpp is already conditional on MOZ_X11 in the moz.build, so these defined(MOZ_X11) conditions should not be necessary at all?

Comment 3

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

Comment on attachment 8980248 [details]
Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,

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

Comment 4

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

Comment on attachment 8980248 [details]
Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,

https://reviewboard.mozilla.org/r/246410/#review252576

> Building of gfxXlibSurface.cpp is already conditional on MOZ_X11 in the moz.build, so these defined(MOZ_X11) conditions should not be necessary at all?

Thanks, it also applies to X11TextureSourceOGL.cpp.

Comment 5

[Lee Salzman [:lsalzman]]

Comment on attachment 8980248 [details]
Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,

https://reviewboard.mozilla.org/r/246410/#review253104

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/f49ea7c48d1a
Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code, r=lsalzman

Comment 7

[Eliza Balazs [:ebalazs_]]

https://hg.mozilla.org/mozilla-central/rev/f49ea7c48d1a