165283 2016-12-01 15:19:36 -0800 Fix WinCairo build after r208997 2018-02-21 12:01:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=165253 P2 Normal --- 1 achristensen achristensen cgarcia commit-queue dino mcatanzaro mmaxfield ossy zan oldest_to_newest 1255514 0 achristensen 2016-12-01 15:19:36 -0800 Fix WinCairo build after r208997 1255515 1 295905 achristensen 2016-12-01 15:22:42 -0800 Created attachment 295905 Patch 1255631 2 295905 cgarcia 2016-12-01 23:57:36 -0800 Comment on attachment 295905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295905&action=review Thanks! > Source/WebCore/platform/graphics/GLContext.cpp:32 > +#if USE(OPENGL_ES_2) > +#include <GLES2/gl2.h> > +#include <GLES3/gl3.h> > +#endif Is this still needed after bug #165253? Plan is to switch to glGetString(GL_VERSION). In any case, let's fix the build now, and we will remove this includes if they are not needed as part of #165253. 1255632 3 295905 achristensen 2016-12-01 23:59:17 -0800 Comment on attachment 295905 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=295905&action=review >> Source/WebCore/platform/graphics/GLContext.cpp:32 >> +#endif > > Is this still needed after bug #165253? Plan is to switch to glGetString(GL_VERSION). In any case, let's fix the build now, and we will remove this includes if they are not needed as part of #165253. I think the include gl2 will be needed still. 1255635 4 295905 commit-queue 2016-12-02 00:24:30 -0800 Comment on attachment 295905 Patch Clearing flags on attachment: 295905 Committed r209233: <http://trac.webkit.org/changeset/209233> 1255636 5 commit-queue 2016-12-02 00:24:34 -0800 All reviewed patches have been landed. Closing bug. 1262489 6 mcatanzaro 2016-12-22 17:38:35 -0800 But: #if USE(OPENGL_ES_2) #include <GLES2/gl2.h> #include <GLES3/gl3.h> #endif You are using a GLES3 header inside a GLES2 guard. I think we need to find a different guard to use instead. 1401205 7 mcatanzaro 2018-02-21 12:01:19 -0800 (In reply to Michael Catanzaro from comment #6) > But: > > #if USE(OPENGL_ES_2) > #include <GLES2/gl2.h> > #include <GLES3/gl3.h> > #endif > > You are using a GLES3 header inside a GLES2 guard. I think we need to find a > different guard to use instead. See bug #183008. 295905 2016-12-01 15:22:42 -0800 2016-12-02 00:24:30 -0800 Patch bug-165283-20161201152217.patch text/plain 1153 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTIxOCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE2LTEyLTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IFdpbkNh aXJvIGJ1aWxkIGFmdGVyIHIyMDg5OTcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NTI4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcDoKKyAgICAg ICAgZ2xHZXRJbnRlZ2VydiBpcyBkZWZpbmVkIGluIGdsMi5oLgorICAgICAgICBHTF9NQUpPUl9W RVJTSU9OIGlzIGRlZmluZWQgaW4gZ2wzLmguCisgICAgICAgIFRoZXNlIGFyZSBub3QgaW5jbHVk ZWQgaW4gdGhlIFdpbkNhaXJvIGJ1aWxkLgorCiAyMDE2LTEyLTAxICBEYXZlIEh5YXR0ICA8aHlh dHRAYXBwbGUuY29tPgogCiAgICAgICAgIFtDU1MgUGFyc2VyXSBPbmx5IGFsbG93IGEgc2luZ2xl IGZvbnQtZmFtaWx5IGluIEBmb250LWZhY2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dMQ29udGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAkocmV2aXNpb24gMjA5MjE4KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR0xDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjYsNiArMjYsMTEgQEAKICNpbmNsdWRlICJHTENvbnRleHRFR0wuaCIKICNlbmRpZgogCisj aWYgVVNFKE9QRU5HTF9FU18yKQorI2luY2x1ZGUgPEdMRVMyL2dsMi5oPgorI2luY2x1ZGUgPEdM RVMzL2dsMy5oPgorI2VuZGlmCisKICNpZiBVU0UoR0xYKQogI2luY2x1ZGUgIkdMQ29udGV4dEdM WC5oIgogI2VuZGlmCg==