Closed Bug 1464037 Opened 5 years ago Closed 5 years ago

Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code

Categories

(Core :: Graphics, enhancement, P2)

Product:
Core
Component:
Graphics
Platform:
All
Linux
Type:
enhancement

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla62
Tracking Flags:
Tracking Status
firefox62 --- fixed

People

(Reporter: stransky, Assigned: stransky)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

Bug 1464037 - Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code,
59 bytes, text/x-review-board-request
lsalzman
: review+
Details 
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.
Summary: Replace GL_PROVIDER_GLX by MOZ_X11 → Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code
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 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 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
Attachment #8980248 - Flags: review?(lsalzman) → review+
Pushed by stransky@redhat.com:
https://hg.mozilla.org/integration/autoland/rev/f49ea7c48d1a
Replace GL_PROVIDER_GLX by MOZ_X11 to build X11 dependent code, r=lsalzman
https://hg.mozilla.org/mozilla-central/rev/f49ea7c48d1a
Status: NEW → RESOLVED
Closed: 5 years ago
status-firefox62: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla62
You need to log in before you can comment on or make changes to this bug.