145156 2015-05-18 17:56:32 -0700 REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined. 2015-05-19 18:02:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 clopez clopez cgarcia commit-queue dino kondapallykalyan noam ossy roger_fong oldest_to_newest 1095765 0 clopez 2015-05-18 17:56:32 -0700 At least on platform GTK, r181571 <http://trac.webkit.org/r181571> broke the build when defining -DENABLE_GLES2=ON. $CC [...] -o Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp.o -c ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1365:5: error: use of undeclared identifier 'glGenVertexArrays' glGenVertexArrays(1, &array); ^ ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1379:5: error: use of undeclared identifier 'glDeleteVertexArrays' glDeleteVertexArrays(1, &array); ^ ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1392:12: error: use of undeclared identifier 'glIsVertexArray'; did you mean 'isVertexArray'? return glIsVertexArray(array); ^~~~~~~~~~~~~~~ isVertexArray ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1385:32: note: 'isVertexArray' declared here GC3Dboolean GraphicsContext3D::isVertexArray(Platform3DObject array) ^ ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1403:5: error: use of undeclared identifier 'glBindVertexArray'; did you mean 'bindVertexArray'? glBindVertexArray(array); ^~~~~~~~~~~~~~~~~ bindVertexArray ../../Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1399:25: note: 'bindVertexArray' declared here void GraphicsContext3D::bindVertexArray(Platform3DObject array) ^ 4 errors generated. ninja: build stopped: subcommand failed. The issue seems to be that Vertex Array Objects (glGenVertexArrays, etc) are in GLESv3 but not in GLESv2. 1095916 1 253382 clopez 2015-05-19 05:42:42 -0700 Created attachment 253382 Patch 1095917 2 commit-queue 2015-05-19 05:44:27 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1095938 3 253382 clopez 2015-05-19 08:33:02 -0700 Comment on attachment 253382 Patch All EWS are happy, so asking for review now. 1095989 4 253382 achristensen 2015-05-19 12:25:26 -0700 Comment on attachment 253382 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=253382&action=review > Source/ThirdParty/ANGLE/include/GLES2/gl2softlinking.h:-164 > -SOFT_LINK(libGLESv2, glBindVertexArray, void, GL_APIENTRY, (GLuint array), (array)); > -SOFT_LINK(libGLESv2, glDeleteVertexArrays, void, GL_APIENTRY, (GLsizei n, const GLuint* arrays), (n, arrays)); > -SOFT_LINK(libGLESv2, glGenVertexArrays, void, GL_APIENTRY, (GLsizei n, const GLuint* arrays), (n, arrays)); > -SOFT_LINK(libGLESv2, glIsVertexArray, GLboolean, GL_APIENTRY, (GLuint array), (array)); Great! This is the proper response to my complaint in https://bugs.webkit.org/show_bug.cgi?id=126944 > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1364 > +#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS)) If we're not using OpenGLESv2, then we don't want WebGL2 functionality to be available at all. This is a good compile fix, but I think we need to make it a step further and make this whole function not available instead of just returning 0. 1096095 5 clopez 2015-05-19 17:10:59 -0700 (In reply to comment #4) > > > Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:1364 > > +#if !USE(OPENGL_ES_2) && (PLATFORM(GTK) || PLATFORM(EFL) || PLATFORM(WIN) || PLATFORM(IOS)) > > If we're not using OpenGLESv2, then we don't want WebGL2 functionality to be > available at all. This is a good compile fix, but I think we need to make > it a step further and make this whole function not available instead of just > returning 0. My understanding is that WebGL2 should not be enabled/compiled when using OpenGLESv2, because OpenGLESv2 lacks some features that are needed for WebGL2 (like Vertex Array Objects). Maybe bug 141178 is a good candidate to fix this in a proper way?. In the meantime I would like to land at least this build fix. BTW, Thanks for the review ;) 1096110 6 253382 commit-queue 2015-05-19 18:01:56 -0700 Comment on attachment 253382 Patch Clearing flags on attachment: 253382 Committed r184605: <http://trac.webkit.org/changeset/184605> 1096111 7 commit-queue 2015-05-19 18:02:02 -0700 All reviewed patches have been landed. Closing bug. 253382 2015-05-19 05:42:42 -0700 2015-05-19 18:01:56 -0700 Patch bug-145156-20150519144239.patch text/plain 5619 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0NTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNzY0NGM5MDcxYWI2MjcwZjE2MTRlNWFhMDJiZThmYzBhYjk4NDgwZS4uMThiNTE3MTQ0OTZi MjcyZjIzZGYwOTgxODdlMDFjNDlhMGE4M2MxMiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEyIEBACisyMDE1LTA1LTE5ICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJl eiAgPGNsb3BlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjE4MTU3MSk6IEJ1 aWxkIGJyb2tlbiB3aGVuIFVTRShPUEVOR0xfRVNfMikgaXMgZGVmaW5lZC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTE1NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5jbHVkZS9HTEVTMi9nbDJz b2Z0bGlua2luZy5oOiBSZXZlcnQgcjE4MTU4OS4gVmVydGV4IEFycmF5IE9iamVjdHMgYXJlIG5v dCBpbiBHTEVTdjIuCisKIDIwMTUtMDUtMTEgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgW1dpbl0gTW92ZSBXaW5kb3dzIGJ1aWxkIHRhcmdldCB0byBXaW5k b3dzIDcgKG9yIG5ld2VyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDlmOGQ2Y2U2ZjI1ZjcyMTJjYzEwNjVmZmY3 OWM5ZDc4MjFhOWYzZjcuLjlhZDk0YzY3ZTViZDU4NWY3ZjRkYzhmMGExMWJlN2RiNDQwOWUwOTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNS0wNS0xOSAgQ2FybG9zIEFsYmVydG8g TG9wZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIx ODE1NzEpOiBCdWlsZCBicm9rZW4gd2hlbiBVU0UoT1BFTkdMX0VTXzIpIGlzIGRlZmluZWQuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUxNTYKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVz dHMsIG5vIGJlaGF2aW9yIGNoYW5nZXMuCisKKyAgICAgICAgVmVydGV4IEFycmF5IE9iamVjdHMg YXJlIG5vdCBhdmFpbGFibGUgaW4gT3BlbkdMRVN2Mi4KKyAgICAgICAgQWRkIGd1YXJkcyB0byBh dm9pZCB1c2luZyB0aGlzIHdoZW4gYnVpbGRpbmcgd2l0aCBHTEVTdjIuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmNyZWF0ZVZlcnRleEFycmF5 KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpkZWxldGVWZXJ0ZXhBcnJh eSk6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6aXNWZXJ0ZXhBcnJheSk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6YmluZFZlcnRleEFycmF5KToK KwogMjAxNS0wNS0xOSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAg IE1hcmsgc3RhdGljIHZhcmlhYmxlcyBhcyBjb25zdCB3aGVuIHBvc3NpYmxlCmRpZmYgLS1naXQg YS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL0dMRVMyL2dsMnNvZnRsaW5raW5nLmgg Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL0dMRVMyL2dsMnNvZnRsaW5raW5nLmgK aW5kZXggZTE3OTUyOTJiYzY5MDUxYTgwMGY5MTRjNDMzODExYjY1NDA2ODYyZi4uMTdiMTE1YzQw OGYxMDNkNmIyNjkyNWU3OGY5ZjcyYjViMmFhZDg3NiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvaW5jbHVkZS9HTEVTMi9nbDJzb2Z0bGlua2luZy5oCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvR0xFUzIvZ2wyc29mdGxpbmtpbmcuaApAQCAtMTU4LDEw ICsxNTgsNiBAQCBTT0ZUX0xJTksobGliR0xFU3YyLCBnbFVuaWZvcm1NYXRyaXgzZnYsIHZvaWQs IEdMX0FQSUVOVFJZLCAoR0xpbnQgbG9jYXRpb24sIEdMcwogU09GVF9MSU5LKGxpYkdMRVN2Miwg Z2xVbmlmb3JtTWF0cml4NGZ2LCB2b2lkLCBHTF9BUElFTlRSWSwgKEdMaW50IGxvY2F0aW9uLCBH THNpemVpIGNvdW50LCBHTGJvb2xlYW4gdHJhbnNwb3NlLCBjb25zdCBHTGZsb2F0KiB2YWx1ZSks IChsb2NhdGlvbiwgY291bnQsIHRyYW5zcG9zZSwgdmFsdWUpKTsKIFNPRlRfTElOSyhsaWJHTEVT djIsIGdsVXNlUHJvZ3JhbSwgdm9pZCwgR0xfQVBJRU5UUlksIChHTHVpbnQgcHJvZ3JhbSksIChw cm9ncmFtKSk7CiBTT0ZUX0xJTksobGliR0xFU3YyLCBnbFZhbGlkYXRlUHJvZ3JhbSwgdm9pZCwg R0xfQVBJRU5UUlksIChHTHVpbnQgcHJvZ3JhbSksIChwcm9ncmFtKSk7Ci1TT0ZUX0xJTksobGli R0xFU3YyLCBnbEJpbmRWZXJ0ZXhBcnJheSwgdm9pZCwgR0xfQVBJRU5UUlksIChHTHVpbnQgYXJy YXkpLCAoYXJyYXkpKTsKLVNPRlRfTElOSyhsaWJHTEVTdjIsIGdsRGVsZXRlVmVydGV4QXJyYXlz LCB2b2lkLCBHTF9BUElFTlRSWSwgKEdMc2l6ZWkgbiwgY29uc3QgR0x1aW50KiBhcnJheXMpLCAo biwgYXJyYXlzKSk7Ci1TT0ZUX0xJTksobGliR0xFU3YyLCBnbEdlblZlcnRleEFycmF5cywgdm9p ZCwgR0xfQVBJRU5UUlksIChHTHNpemVpIG4sIGNvbnN0IEdMdWludCogYXJyYXlzKSwgKG4sIGFy cmF5cykpOwotU09GVF9MSU5LKGxpYkdMRVN2MiwgZ2xJc1ZlcnRleEFycmF5LCBHTGJvb2xlYW4s IEdMX0FQSUVOVFJZLCAoR0x1aW50IGFycmF5KSwgKGFycmF5KSk7CiBTT0ZUX0xJTksobGliR0xF U3YyLCBnbFZlcnRleEF0dHJpYjFmLCB2b2lkLCBHTF9BUElFTlRSWSwgKEdMdWludCBpbmR4LCBH TGZsb2F0IHgpLCAoaW5keCwgeCkpOwogU09GVF9MSU5LKGxpYkdMRVN2MiwgZ2xWZXJ0ZXhBdHRy aWIxZnYsIHZvaWQsIEdMX0FQSUVOVFJZLCAoR0x1aW50IGluZHgsIGNvbnN0IEdMZmxvYXQqIHZh bHVlcyksIChpbmR4LCB2YWx1ZXMpKTsKIFNPRlRfTElOSyhsaWJHTEVTdjIsIGdsVmVydGV4QXR0 cmliMmYsIHZvaWQsIEdMX0FQSUVOVFJZLCAoR0x1aW50IGluZHgsIEdMZmxvYXQgeCwgR0xmbG9h dCB5KSwgKGluZHgsIHgsIHkpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVu R0xDb21tb24uY3BwCmluZGV4IDU2OGJmOTU5OTQxYjBlZmFjMzVkYzdmZDE3MGZiMGRjMTdhZmU4 MDcuLjlkNDJlZTJlZjliNzQwNGJhY2IxYTRiZGM0NDZhNjFjYWQxZjUzM2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQz RE9wZW5HTENvbW1vbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMQ29tbW9uLmNwcApAQCAtMTM2MSw3ICsxMzYx LDcgQEAgUGxhdGZvcm0zRE9iamVjdCBHcmFwaGljc0NvbnRleHQzRDo6Y3JlYXRlVmVydGV4QXJy YXkoKQogewogICAgIG1ha2VDb250ZXh0Q3VycmVudCgpOwogICAgIEdMdWludCBhcnJheSA9IDA7 Ci0jaWYgKFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oRUZMKSB8fCBQTEFURk9STShXSU4pIHx8 IFBMQVRGT1JNKElPUykpCisjaWYgIVVTRShPUEVOR0xfRVNfMikgJiYgKFBMQVRGT1JNKEdUSykg fHwgUExBVEZPUk0oRUZMKSB8fCBQTEFURk9STShXSU4pIHx8IFBMQVRGT1JNKElPUykpCiAgICAg Z2xHZW5WZXJ0ZXhBcnJheXMoMSwgJmFycmF5KTsKICNlbGlmIGRlZmluZWQoR0xfQVBQTEVfdmVy dGV4X2FycmF5X29iamVjdCkgJiYgR0xfQVBQTEVfdmVydGV4X2FycmF5X29iamVjdAogICAgIGds R2VuVmVydGV4QXJyYXlzQVBQTEUoMSwgJmFycmF5KTsKQEAgLTEzNzUsNyArMTM3NSw3IEBAIHZv aWQgR3JhcGhpY3NDb250ZXh0M0Q6OmRlbGV0ZVZlcnRleEFycmF5KFBsYXRmb3JtM0RPYmplY3Qg YXJyYXkpCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsK LSNpZiAoUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShFRkwpIHx8IFBMQVRGT1JNKFdJTikgfHwg UExBVEZPUk0oSU9TKSkKKyNpZiAhVVNFKE9QRU5HTF9FU18yKSAmJiAoUExBVEZPUk0oR1RLKSB8 fCBQTEFURk9STShFRkwpIHx8IFBMQVRGT1JNKFdJTikgfHwgUExBVEZPUk0oSU9TKSkKICAgICBn bERlbGV0ZVZlcnRleEFycmF5cygxLCAmYXJyYXkpOwogI2VsaWYgZGVmaW5lZChHTF9BUFBMRV92 ZXJ0ZXhfYXJyYXlfb2JqZWN0KSAmJiBHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2JqZWN0CiAgICAg Z2xEZWxldGVWZXJ0ZXhBcnJheXNBUFBMRSgxLCAmYXJyYXkpOwpAQCAtMTM4OCw3ICsxMzg4LDcg QEAgR0MzRGJvb2xlYW4gR3JhcGhpY3NDb250ZXh0M0Q6OmlzVmVydGV4QXJyYXkoUGxhdGZvcm0z RE9iamVjdCBhcnJheSkKICAgICAgICAgcmV0dXJuIEdMX0ZBTFNFOwogICAgIAogICAgIG1ha2VD b250ZXh0Q3VycmVudCgpOwotI2lmIChQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKEVGTCkgfHwg UExBVEZPUk0oV0lOKSB8fCBQTEFURk9STShJT1MpKQorI2lmICFVU0UoT1BFTkdMX0VTXzIpICYm IChQTEFURk9STShHVEspIHx8IFBMQVRGT1JNKEVGTCkgfHwgUExBVEZPUk0oV0lOKSB8fCBQTEFU Rk9STShJT1MpKQogICAgIHJldHVybiBnbElzVmVydGV4QXJyYXkoYXJyYXkpOwogI2VsaWYgZGVm aW5lZChHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2JqZWN0KSAmJiBHTF9BUFBMRV92ZXJ0ZXhfYXJy YXlfb2JqZWN0CiAgICAgcmV0dXJuIGdsSXNWZXJ0ZXhBcnJheUFQUExFKGFycmF5KTsKQEAgLTEz OTksNyArMTM5OSw3IEBAIEdDM0Rib29sZWFuIEdyYXBoaWNzQ29udGV4dDNEOjppc1ZlcnRleEFy cmF5KFBsYXRmb3JtM0RPYmplY3QgYXJyYXkpCiB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpiaW5k VmVydGV4QXJyYXkoUGxhdGZvcm0zRE9iamVjdCBhcnJheSkKIHsKICAgICBtYWtlQ29udGV4dEN1 cnJlbnQoKTsKLSNpZiAoUExBVEZPUk0oR1RLKSB8fCBQTEFURk9STShFRkwpIHx8IFBMQVRGT1JN KFdJTikgfHwgUExBVEZPUk0oSU9TKSkKKyNpZiAhVVNFKE9QRU5HTF9FU18yKSAmJiAoUExBVEZP Uk0oR1RLKSB8fCBQTEFURk9STShFRkwpIHx8IFBMQVRGT1JNKFdJTikgfHwgUExBVEZPUk0oSU9T KSkKICAgICBnbEJpbmRWZXJ0ZXhBcnJheShhcnJheSk7CiAjZWxpZiBkZWZpbmVkKEdMX0FQUExF X3ZlcnRleF9hcnJheV9vYmplY3QpICYmIEdMX0FQUExFX3ZlcnRleF9hcnJheV9vYmplY3QKICAg ICBnbEJpbmRWZXJ0ZXhBcnJheUFQUExFKGFycmF5KTsK