1466778 - [Wayland] 'sEGLLibrary' was not declared in this scope on wayland build after Bug 1451183 is landed

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Hiroshi Hatake [:cosmo0920]]

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:60.0) Gecko/20100101 Firefox/60.0
Build ID: 20180516032328

Steps to reproduce:

Clone mozilla-central repository.

./mach build with the following building configuration:

---
. $topsrcdir/browser/config/mozconfig

ac_add_options --enable-default-toolkit=cairo-gtk3-wayland

mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
mk_add_options AUTOCLOBBER=1

ac_add_options --disable-crashreporter
ac_add_options --without-system-nspr
ac_add_options --without-system-nss

ac_add_options --enable-debug
ac_add_options --disable-optimize

ac_add_options --enable-release
ac_add_options --disable-tests
---


Actual results:

Got building error:

---
7:09.80 In file included from /home/hhatake/GitHub/gecko-dev/objdir/gfx/gl/Unified_cpp_gfx_gl0.cpp:56:0:
 7:09.80 /home/hhatake/GitHub/gecko-dev/gfx/gl/GLContextProviderEGL.cpp: In static member function ‘static void* mozilla::gl::GLContextEGL::CreateWaylandBufferSurface(EGLConfig, mozilla::gfx::IntSize&)’:
 7:09.80 /home/hhatake/GitHub/gecko-dev/gfx/gl/GLContextProviderEGL.cpp:712:9: error: ‘sEGLLibrary’ was not declared in this scope
 7:09.80          sEGLLibrary.fCreateWindowSurface(EGL_DISPLAY(), config, eglwindow, 0);
 7:09.80          ^~~~~~~~~~~
 7:13.18 gfx/sfntly/cpp/src
 7:13.45 /home/hhatake/GitHub/gecko-dev/config/rules.mk:1031: ターゲット 'Unified_cpp_gfx_gl0.o' のレシピで失敗しました
 7:13.45 make[4]: *** [Unified_cpp_gfx_gl0.o] エラー 1
 7:13.45 /home/hhatake/GitHub/gecko-dev/config/recurse.mk:73: ターゲット 'gfx/gl/target' のレシピで失敗しました
 7:13.45 make[3]: *** [gfx/gl/target] エラー 2
 7:13.45 make[3]: *** 未完了のジョブを待っています....

---


Expected results:

Build success without compilation error.

Comment 1

[Hiroshi Hatake [:cosmo0920]]

Attachment: Bug 1466778 - Make usable GLLibraryEGL on wayland build, ?

After Bug 1451183 is landed, sEGLLibrary is undefined and we should use
gl::GLLibraryEGL::Get() instead of sEGLLibrary directly.

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

Comment 2

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

Comment on attachment 8983337 [details]
Bug 1466778 - Make usable GLLibraryEGL on wayland build, ?

https://reviewboard.mozilla.org/r/249232/#review255774

Looks fine for me.

Comment 3

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

Comment on attachment 8983337 [details]
Bug 1466778 - Make usable GLLibraryEGL on wayland build, ?

https://reviewboard.mozilla.org/r/249232/#review255776

I'm not a gfx peer, adding Lee.

Comment 4

[Lee Salzman [:lsalzman]]

Comment on attachment 8983337 [details]
Bug 1466778 - Make usable GLLibraryEGL on wayland build, ?

https://reviewboard.mozilla.org/r/249232/#review255876

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/26c53d78c90a
Make usable GLLibraryEGL on wayland build, r=lsalzman,stransky?

Comment 6

[Cristina Coroiu [:ccoroiu]]

https://hg.mozilla.org/mozilla-central/rev/26c53d78c90a