236593 2022-02-14 07:52:03 -0800 [GTK][WPE] Inclusion of OpenGLShims.h should not depend on USE(GLX) 2022-02-15 02:33:00 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=236592 https://bugs.webkit.org/show_bug.cgi?id=146680 https://bugs.webkit.org/show_bug.cgi?id=208907 InRadar P2 Normal --- 1 aperez aperez alex clord contact+bugs.webkit.org dpa-webkit fujii kbr mcatanzaro mmaxfield webkit-bug-importer oldest_to_newest 1841250 0 aperez 2022-02-14 07:52:03 -0800 The OpenGLShims.h header does not contain any X11- nor GLX-specific definitions, and actually in some cases failing to include it can result failing to complete the build when GLX is not available in the system. This is known to happen in some setups where the main OpenGL library is provided by libglvnd (see related bug #236592, too) 1841251 1 aperez 2022-02-14 07:54:37 -0800 Thanks for Haelwenn “lanodan” Monnier who pointed the issue on IRC :) 1841254 2 aperez 2022-02-14 08:21:07 -0800 At some point we may be able to simplify things, see bug #146680 for an idea to always use libepoxy, but for the build fix I want to solve here I will do the minimum amount of changes needed, taking into account that: - For USE(LIBEPOXY) we should use <epoxy/gl.h> - Else, for USE(OPENGL_ES) we should use <GLES2/gl2.h> directly - Otherwise, we use WebCore's "OpenGLShims.h" (There is also "OpenGLESShims.h", which adds a few definitions only without trying to piggyback on top of <GLES2/gl2.h>; I think it is okay to include it only in sources which use definitions from it.) 1841266 3 mcatanzaro 2022-02-14 08:44:46 -0800 Can we delete this mess if we require epoxy? Seems like past time to do that? 1841367 4 aperez 2022-02-14 12:52:04 -0800 (In reply to Michael Catanzaro from comment #3) > Can we delete this mess if we require epoxy? Seems like past time to do that? Yes, that would be bug #146680 which I linked earlier. Here I only want to do the minimum needed to get things going, because replacing usage if USE(OPENGL_ES) with USE(LIBEPOXY) requires substantially more work and testing — but sure I agree it would be neat to remove choices here. 1841403 5 451941 aperez 2022-02-14 13:56:53 -0800 Created attachment 451941 Patch 1841414 6 451941 mcatanzaro 2022-02-14 14:28:55 -0800 Comment on attachment 451941 Patch This looks suspiciously similar to bug #208907. Please look at that one too before landing. 1841607 7 aperez 2022-02-15 00:40:13 -0800 *** Bug 208907 has been marked as a duplicate of this bug. *** 1841608 8 aperez 2022-02-15 00:43:48 -0800 Let's land this, I have tested builds of WPE with this patch, and of the GTK port with Mesa, both with and without GLX; and tests passed. Also lanodan has tried a build with the patch applied in Gentoo with the set of build options that were making the build fail there, and that worked fine as well. The build failure from the api-gtk EWS builder is unrelated to the patch. 1841616 9 ews-feeder 2022-02-15 01:08:17 -0800 Committed r289795 (247260@main): <https://commits.webkit.org/247260@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451941. 1841617 10 webkit-bug-importer 2022-02-15 01:09:21 -0800 <rdar://problem/88953005> 451941 2022-02-14 13:56:53 -0800 2022-02-15 02:33:00 -0800 Patch bug-236593-20220214235652.patch text/plain 3529 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzUwNjQzMmVjNGZlODdm OTAxMmUwYmU3MDYwNzlhMjZhODVhYjIxZS4uN2ZhYjBkMTExMmM2NGMwNmUxYTcxNzAxZGFjOWY1 ZWZjOTg2ZjA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTE0ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11b V1BFXSBJbmNsdXNpb24gb2YgT3BlbkdMU2hpbXMuaCBzaG91bGQgbm90IGRlcGVuZCBvbiBVU0Uo R0xYKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2 NTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4 dC5jcHA6IFJlbW92ZSBpbmNsdXNpb24gb2YgT3BlbkdMU2hpbXMuaCBndWFyZGVkIGJ5IFVTRShH TFgpLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oOiBJbmNsdWRlIE9w ZW5HTFNoaW1zLmggYXMgZmFsbGJhY2sgb3B0aW9uIHdoZW4gbmVpdGhlcgorICAgICAgICBVU0Uo TElCRVBPWFkpIG5vciBVU0UoT1BFTkdMX0VTKSBhcmUgaW50byBlZmZlY3QuCisKIDIwMjItMDIt MTQgIEVucmlxdWUgT2Nhw7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNvbT4KIAogICAg ICAgICBEb24ndCB0aHJvdyBleGNlcHRpb24gd2hlbiBjb250cm9scyBhcmUgcmVtb3ZlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCAzNTZkNzYxODliNGU4ZTdhOGIxOTZkNzNiYzE2ZmY5NGU5ZjBhMjMzLi4xMjU4NmI3 YTI1MDQ1Zjg3NDY0NGI0ZmIyNTRlY2NjZWJmOGUzNTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIyLTAyLTE0ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS11bV1BFXSBJbmNsdXNpb24gb2YgT3BlbkdMU2hpbXMuaCBzaG91 bGQgbm90IGRlcGVuZCBvbiBVU0UoR0xYKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0UHJvdG9jb2xIYW5k bGVyLmNwcDogTW92ZSBpbmNsdXNpb24gb2YgR0wvZ2x4LmggdW5kZXIgYQorICAgICAgICBQTEFU Rk9STShYMTEpIGd1YXJkLCBhbmQgaW5jbHVzaW9uIG9mIFdlYkNvcmUvT3BlbkdMU2hpbXMuaCBp bnRvIGEgY2hhaW4gb2YgZ3VhcmRzCisgICAgICAgIHdoaWNoIHBpY2tzIGl0IGlmIFVTRShMSUJF UE9YWSkgYW5kIFVTRShPUEVOR0xfRVMpIGFyZSBib3RoIGZhbHNlLCB3aGljaCBpcyB0aGUgc2Ft ZQorICAgICAgICBjaGVja3MgZG9uZSBpbiBvdGhlciBwYXJ0cyBvZiB0aGUgY29kZSB3aGVyZSB0 aGVzZSBhcmUgbmVlZGVkLgorCiAyMDIyLTAyLTEzICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAppbmRleCAw Y2MyZDRlOGYxYzZlYzU4ZjhiMjU2OTg2ZDAwY2NmOTk2YzQ3MTE3Li4xNzg5MjYxMWUyZjQ5ZGIw Y2FhNzAzMmJhZGY2MDgwYzQxYWMwMmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dMQ29udGV4dC5jcHAKQEAgLTMxLDcgKzMxLDYgQEAKIAogI2lmIFVTRShHTFgp CiAjaW5jbHVkZSAiR0xDb250ZXh0R0xYLmgiCi0jaW5jbHVkZSAiT3BlbkdMU2hpbXMuaCIKICNl bmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HTENvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dMQ29udGV4dC5oCmluZGV4IGM5YjY1OTk5ZThmZjgyOGY2ZjdmNjZkYjQ2ZGQyMjEw YWE5ODZlNjYuLmQ3ODU3NmEyYjZkZjcxNTgxNjhkYzMzZjVjNzMyYWVlZWRlNTc3NWMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dMQ29udGV4dC5oCkBAIC0yOCw2ICsy OCw4IEBACiAjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KICNlbGlmIFVTRShPUEVOR0xfRVMpCiAjaW5j bHVkZSA8R0xFUzIvZ2wyLmg+CisjZWxzZQorI2luY2x1ZGUgIk9wZW5HTFNoaW1zLmgiCiAjZW5k aWYKIAogI2lmIFVTRShFR0wpICYmICFQTEFURk9STShHVEspCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRQcm90b2NvbEhhbmRsZXIuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2dsaWIvV2ViS2l0UHJvdG9jb2xIYW5kbGVyLmNwcApp bmRleCAwMTM5NDExMDJkNDFiN2RiZGZiZjkxNjYxYTk3NjgwNDBkNWFjNTkwLi45ZmM0ZDMxOTkw MzYwMzlkNDhhZTdiYjJhMzJhMDljZmY1ODMwNjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvZ2xpYi9XZWJLaXRQcm90b2NvbEhhbmRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9nbGliL1dlYktpdFByb3RvY29sSGFuZGxlci5jcHAKQEAg LTUzLDEwICs1MywxNyBAQAogCiAjaWYgUExBVEZPUk0oWDExKQogI2luY2x1ZGUgPFdlYkNvcmUv UGxhdGZvcm1EaXNwbGF5WDExLmg+CisjaWYgVVNFKEdMWCkKKyNpbmNsdWRlIDxHTC9nbHguaD4K KyNlbmRpZgogI2VuZGlmCiAKICNpZiBVU0UoTElCRVBPWFkpCiAjaW5jbHVkZSA8ZXBveHkvZ2wu aD4KKyNlbGlmIFVTRShPUEVOR0xfRVMpCisjaW5jbHVkZSA8R0xFUzIvZ2wyLmg+CisjZWxzZQor I2luY2x1ZGUgPFdlYkNvcmUvT3BlbkdMU2hpbXMuaD4KICNlbmRpZgogCiAjaWYgVVNFKEVHTCkK QEAgLTY3LDExICs3NCw2IEBACiAjZW5kaWYKICNlbmRpZgogCi0jaWYgVVNFKEdMWCkKLSNpbmNs dWRlIDxHTC9nbHguaD4KLSNpbmNsdWRlIDxXZWJDb3JlL09wZW5HTFNoaW1zLmg+Ci0jZW5kaWYK LQogI2lmIFVTRShHU1RSRUFNRVIpCiAjaW5jbHVkZSA8Z3N0L2dzdC5oPgogI2VuZGlmCg==