225867 2021-05-17 06:41:10 -0700 [GTK] [2.33.1] Fails to build when HAVE_OPENGL_ES_3 is on 2021-05-17 15:55:25 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto webkit-unassigned aperez bugs-noreply dino ews-watchlist graouts kondapallykalyan mcatanzaro oldest_to_newest 1760733 0 berto 2021-05-17 06:41:10 -0700 After r276368 WebKitGTK fails to build if HAVE_OPENGL_ES_3 is on: FAILED: Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp.o In file included from ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:61: ../Source/WebCore/platform/graphics/OpenGLESShims.h:48: warning: "GL_COLOR_ATTACHMENT0_EXT" redefined 48 | #define GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT0 | In file included from ../Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h:37, from ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:35: /usr/include/GLES2/gl2ext.h:1336: note: this is the location of the previous definition 1336 | #define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 | ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp: In member function ‘virtual void WebCore::GraphicsContextGLOpenGL::copyBufferSubData(GCGLenum, GCGLenum, GCGLintptr, GCGLintptr, GCGLsizeiptr)’: ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:2206:7: error: ‘::glCopyBufferSubData’ has not been declared; did you mean ‘copyBufferSubData’? 2206 | ::glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size); | ^~~~~~~~~~~~~~~~~~~ | copyBufferSubData ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp: In member function ‘virtual void WebCore::GraphicsContextGLOpenGL::getBufferSubData(GCGLenum, GCGLintptr, GCGLSpan<void>)’: ../Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:2219:23: error: ‘::glMapBufferRange’ has not been declared; did you mean ‘bindBufferRange’? 2219 | GCGLvoid* ptr = ::glMapBufferRange(target, offset, data.bufSize, GraphicsContextGL::MAP_READ_BIT); | ^~~~~~~~~~~~~~~~ | bindBufferRange 1760750 1 428830 berto 2021-05-17 08:22:48 -0700 Created attachment 428830 Patch 1760764 2 428830 mcatanzaro 2021-05-17 09:03:05 -0700 Comment on attachment 428830 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428830&action=review > Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h:40 > +#if HAVE(OPENGL_ES_3) > +#include <GLES3/gl3.h> > +#endif // HAVE(OPENGL_ES_3) > #include <GLES2/gl2.h> > #include <GLES2/gl2ext.h> We want *both* the GLES3 header *and* the GLES2 headers...? 1760772 3 428830 aperez 2021-05-17 09:18:29 -0700 Comment on attachment 428830 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428830&action=review >> Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.h:40 >> #include <GLES2/gl2ext.h> > > We want *both* the GLES3 header *and* the GLES2 headers...? IIUC any GLES3 implementation needs to *also* be a GLES2 implementation, and including both should be harmless. As a matter of fact libGLESv2.so is expected to provide both the GLES2 + GLES3 symbols, too :) 1760883 4 428869 berto 2021-05-17 14:15:13 -0700 Created attachment 428869 Patch v2 Actually gl3.h has the entire contents of gl2.h plus the extra definitions, so there's no reason to include both. Here's an alternative patch. (gl3ext.h is currently empty so I'm not including it) 1760905 5 berto 2021-05-17 14:45:47 -0700 (In reply to Alberto Garcia from comment #4) > Created attachment 428869 [details] > Patch v2 > > Actually gl3.h has the entire contents of gl2.h plus the extra definitions, > so there's no reason to include both. > > Here's an alternative patch. Actually this one doesn't work because WebKit uses symbols from gl2ext.h that are not defined elsewhere, so I'm committing the original patch. 1760919 6 ews-feeder 2021-05-17 15:55:21 -0700 Committed r277609 (237826@main): <https://commits.webkit.org/237826@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428830. 428830 2021-05-17 08:22:48 -0700 2021-05-17 15:55:23 -0700 Patch 225867.diff text/plain 1147 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxMTFkOWI3ZTcyZDAuLjY2MmU0YTNkYzA5NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIxLTA1LTE3ICBBbGJlcnRvIEdhcmNpYSAgPGJlcnRvQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gWzIuMzMuMV0gRmFpbHMgdG8gYnVpbGQgd2hlbiBIQVZFX09Q RU5HTF9FU18zIGlzIG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjU4NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbmNsdWRlIEdMRVMzL2dsMy5oIGlmIEhBVkVfT1BFTkdMX0VTXzMgaXMgc2V0Lgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTEVT Lmg6CisKIDIwMjEtMDUtMTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAg ICB3aWxsLWNoYW5nZTogY29udGFpbiBzaG91bGQgY3JlYXRlIGEgY29udGFpbmluZyBibG9jawpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVu c2lvbnNHTE9wZW5HTEVTLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvRXh0ZW5zaW9uc0dMT3BlbkdMRVMuaAppbmRleCBiNzA4NmM2YmY5YTYuLjlhNTgxYTAwMGRk MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4 dGVuc2lvbnNHTE9wZW5HTEVTLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTEVTLmgKQEAgLTMzLDYgKzMzLDkgQEAKICNpZiBV U0UoTElCRVBPWFkpCiAjaW5jbHVkZSA8ZXBveHkvZ2wuaD4KICNlbHNlCisjaWYgSEFWRShPUEVO R0xfRVNfMykKKyNpbmNsdWRlIDxHTEVTMy9nbDMuaD4KKyNlbmRpZiAvLyBIQVZFKE9QRU5HTF9F U18zKQogI2luY2x1ZGUgPEdMRVMyL2dsMi5oPgogI2luY2x1ZGUgPEdMRVMyL2dsMmV4dC5oPgog I2VuZGlmCg== 428869 2021-05-17 14:15:13 -0700 2021-05-17 14:46:49 -0700 Patch v2 225867v2.diff text/plain 1126 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkZTRkNTBkZmFhMDkuLjk2YmZmYjM5NDBjZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDIxLTA1LTE3ICBBbGJlcnRvIEdhcmNpYSAgPGJlcnRvQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gWzIuMzMuMV0gRmFpbHMgdG8gYnVpbGQgd2hlbiBIQVZFX09Q RU5HTF9FU18zIGlzIG9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjU4NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbmNsdWRlIHRoZSBHTEVTMyBoZWFkZXJzIGlmIEhBVkVfT1BFTkdMX0VTXzMgaXMg c2V0LgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9w ZW5HTEVTLmg6CisKIDIwMjEtMDUtMTYgIFRpbSBOZ3V5ZW4gIDxudGltQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHdpbGwtY2hhbmdlOiB0cmFuc2Zvcm0tc3R5bGUgY3JlYXRlIGEgY29udGFp bmluZyBibG9jawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTEVTLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uc0dMT3BlbkdMRVMuaAppbmRleCBiNzA4NmM2YmY5YTYu LmRhZDI1ODVhOWJlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTEVTLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnNHTE9wZW5HTEVTLmgKQEAgLTMyLDYgKzMy LDggQEAKIAogI2lmIFVTRShMSUJFUE9YWSkKICNpbmNsdWRlIDxlcG94eS9nbC5oPgorI2VsaWYg SEFWRShPUEVOR0xfRVNfMykKKyNpbmNsdWRlIDxHTEVTMy9nbDMuaD4KICNlbHNlCiAjaW5jbHVk ZSA8R0xFUzIvZ2wyLmg+CiAjaW5jbHVkZSA8R0xFUzIvZ2wyZXh0Lmg+Cg==