183008 2018-02-21 10:56:22 -0800 including both gl3.h and gl2.h when USE_OPENGL_ES is enabled 2018-02-22 07:33:09 -0800 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyun.kwon magomez achristensen bugs-noreply commit-queue magomez mcatanzaro oldest_to_newest 1401168 0 hyun.kwon 2018-02-21 10:56:22 -0800 Both gl2.h and gl3.h are included when USE_OPENGL_ES is enabled in [1]. This breaks the build for systems that only support OpenGLES2, but not OpenGLES3. USE_OPENGL_ES should specify the version of the API and include the corresponding header only, to avoid any confusion. [1] https://github.com/WebKit/webkit/blob/master/Source/WebCore/platform/graphics/GLContext.cpp#L31 Thanks, -hyun 1401208 1 mcatanzaro 2018-02-21 12:01:32 -0800 USE_OPENGL_ES is supposed to require only OpenGL ES 2, not OpenGL ES 3. Looks like this has been broken since r209233, bug #165283, over a year ago. I thought we had a requirement to support WebKit on devices that have only OpenGL ES 2. However, if nobody has noticed that this has been broken for over a year, maybe that's not so important anymore. 1401389 2 magomez 2018-02-22 01:22:16 -0800 > Both gl2.h and gl3.h are included when USE_OPENGL_ES is enabled in [1]. This > breaks the build for systems that only support OpenGLES2, but not OpenGLES3. > USE_OPENGL_ES should specify the version of the API and include the > corresponding header only, to avoid any confusion. It was that way actually. USE_OPENGL_ES was USE_OPENGL_ES_2 and (for linux ports) meant we were using the GLES2 API, but it was renamed to USE_OPENGL_ES in r228590 as in apple ports it can mean GLES2 or GLES3 APIs. In any case, the <GLES3/gl3.h> include should not be necessary. They seem to include it just for the definition of GL_MAJOR_VERSION, which which seems to be only used in Extensions3DOpenGLCommon::initializeAvailableExtensions() in a platform guarded code. I'll send a temptative patch removing that include to see what exactly (if anything) fails in the wincairo bot. 1401395 3 334443 magomez 2018-02-22 01:56:12 -0800 Created attachment 334443 Patch 1401415 4 334443 commit-queue 2018-02-22 07:33:08 -0800 Comment on attachment 334443 Patch Clearing flags on attachment: 334443 Committed r228917: <https://trac.webkit.org/changeset/228917> 1401416 5 commit-queue 2018-02-22 07:33:09 -0800 All reviewed patches have been landed. Closing bug. 334443 2018-02-22 01:56:12 -0800 2018-02-22 07:33:08 -0800 Patch bug-183008-20180222105611.patch text/plain 1251 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4OTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2E2NjI0NTljMzM5OWZi ZmUyOThmZTkzMDZiMTliNWViODg2ZjgzZS4uM2EyNjRkNmRkYzRhNTg3YmU3YzNiYjk5NDQxZjhh NGViYjQ0NWQ5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTAyLTIyICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgaW5jbHVkaW5nIGJvdGgg Z2wzLmggYW5kIGdsMi5oIHdoZW4gVVNFX09QRU5HTF9FUyBpcyBlbmFibGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODMwMDgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBpbmNsdWRlIEdMRVMz IGhlYWRlcnMgYXMgd2Ugc3RpY2sgdG8gR0xFUzIgQVBJIHJlc291cmNlcy4KKworICAgICAgICBO byBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL0dMQ29udGV4dC5jcHA6CisKIDIwMTgtMDItMjEgIFphbGFuIEJ1anRhcyAgPHphbGFu QGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIE1vdmUgUmVuZGVyT2Jq ZWN0OjppbnNlcnRlZEludG8oKSBtdXRhdGlvbiBsb2dpYyB0byBSZW5kZXJUcmVlQnVpbGRlcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5jcHAKaW5kZXgg MDFkNGIwN2ZmNTI4NWExNDU5NmRjZmFkMTYxZTQwOTY5ZmMzMmViOS4uMjhkOWIzYmRkYWM5YjRi MjEzMTg3ZjAyYTFlYTMwMjdkZjJiMGJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9HTENvbnRleHQuY3BwCkBAIC0zMSw3ICszMSw2IEBACiAjZWxpZiBVU0UoT1BF TkdMX0VTKQogI2RlZmluZSBHTF9HTEVYVF9QUk9UT1RZUEVTIDEKICNpbmNsdWRlIDxHTEVTMi9n bDIuaD4KLSNpbmNsdWRlIDxHTEVTMy9nbDMuaD4KICNlbmRpZgogCiAjaWYgVVNFKEdMWCkK