143763 2015-04-15 06:25:18 -0700 [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs 2015-05-18 11:44:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 133028 1 lrn1986 webkit-unassigned cgarcia lrn1986 oldest_to_newest 1085458 0 lrn1986 2015-04-15 06:25:18 -0700 OpenGLShims.cpp says PLATFORM(WIN), means OS(WINDOWS) 1085543 1 250809 lrn1986 2015-04-15 09:59:19 -0700 Created attachment 250809 Change OpenGL checks to work on W32, add libopengl32 AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC. Don't try to check for dlopen() on W32 (it might be available, but native code is already here, so use it). Correctly cast the result of GetProcAddress(), because C++. Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains: *** Warning: linker path does not have real file for library -lGL. 1086475 2 251067 mcrha 2015-04-17 16:32:16 -0700 Created attachment 251067 wk patch Just in case, this is the only change I use with webkit-2.4 branch at revision 182543, even I configure with: --enable-win32-target --enable-spellcheck --enable-jit --disable-geolocation --disable-video --disable-web-audio --disable-webgl --disable-accelerated-compositing --disable-glx --disable-egl --disable-gles2 --disable-webkit2 --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf thus maybe the LRN changes are skipped completely for me. 1086499 3 lrn1986 2015-04-17 17:42:53 -0700 (In reply to comment #2) > Created attachment 251067 [details] > wk patch > > Just in case, this is the only change I use with webkit-2.4 branch at > revision 182543, even I configure with: > > --enable-win32-target --enable-spellcheck --enable-jit --disable-geolocation > --disable-video --disable-web-audio --disable-webgl > --disable-accelerated-compositing --disable-glx --disable-egl > --disable-gles2 --disable-webkit2 --disable-gtk-doc --disable-gtk-doc-html > --disable-gtk-doc-pdf > > thus maybe the LRN changes are skipped completely for me. These are practically equivalent. This: + elif test "$os_win32" = "yes"; then + acceleration_description="$acceleration_description (gl" + OPENGL_LIBS="-lopengl32" else acceleration_description="$acceleration_description (gl" OPENGL_LIBS="-lGL" comes just a few lines above this: else acceleration_description="$acceleration_description (gl" - OPENGL_LIBS="-lGL" + case "$host" in + *-*-mingw*) + OPENGL_LIBS="-lopengl32" + ;; + *) + OPENGL_LIBS="-lGL" + ;; + esac and does the same thing in a slightly diffrent way (checks for os_win32, not host). Also, AFAIU, some webgl code is still compiled even with --disable-webgl. I didn't dig any further though. My configure arguments are: --disable-x11-target \ --enable-win32-target \ --enable-jit \ --with-gtk=3.0 \ --enable-webgl \ --disable-webkit2 \ --enable-spellcheck \ --disable-geolocation \ --disable-accelerated-compositing \ --enable-debug-symbols=min \ --enable-optimizations \ --enable-introspection \ --enable-gtk-doc \ --enable-silent-rules \ 1095648 4 cgarcia 2015-05-18 11:44:52 -0700 Committed to 2.4 http://trac.webkit.org/changeset/184505 250809 2015-04-15 09:59:19 -0700 2015-05-18 11:43:34 -0700 Change OpenGL checks to work on W32, add libopengl32 Change-OpenGL-checks-to-work-on-W32-add-libopengl3.patch text/plain 5329 lrn1986 RnJvbSAwNDI1MDU2OTZiYzY2ODFiMDI1ZGJhZDRhZGZhMGQ4ZGQ3MjVmMTNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/PUQwPUEwPUQxPTgzPUQxPTgxPUQwPUJCPUQw PUIwPUQwPUJEPTIwPUQwPTk4PUQwPUI2PUQwPUIxPz0KID0/VVRGLTg/cT89RDE9ODM9RDA9QkI9 RDA9QjA9RDE9ODI9RDA9QkU9RDA9QjI/PSA8bHJuMTk4NkBnbWFpbC5jb20+CkRhdGU6IE1vbiwg MTMgQXByIDIwMTUgMTU6MzE6NTYgKzAwMDAKU3ViamVjdDogW1BBVENIXSBDaGFuZ2UgT3BlbkdM IGNoZWNrcyB0byB3b3JrIG9uIFczMiwgYWRkIGxpYm9wZW5nbDMyCgpBR2FpbiwgdXNlIE9TKFdJ TkRPV1MpIGZvciB0aGluZ3MgdGhhdCBhcmUgVzMyIGJ1dCBub3QgbmVjZXNzYXJpbHkgTVNWQy4K RG9uJ3QgdHJ5IHRvIGNoZWNrIGZvciBkbG9wZW4oKSBvbiBXMzIgKGl0IG1pZ2h0IGJlIGF2YWls YWJsZSwgYnV0Cm5hdGl2ZSBjb2RlIGlzIGFscmVhZHkgaGVyZSwgc28gdXNlIGl0KS4KCkNvcnJl Y3RseSBjYXN0IHRoZSByZXN1bHQgb2YgR2V0UHJvY0FkZHJlc3MoKSwgYmVjYXVzZSBDKysuCgpM aW5rIFczMiB2ZXJzaW9uIHRvIC1sT3BlbkdMMzIgaW5zdGVhZCBvZiAtbEdMLCBvdGhlcndpc2Ug bGlidG9vbCBjb21wbGFpbnM6CioqKiBXYXJuaW5nOiBsaW5rZXIgcGF0aCBkb2VzIG5vdCBoYXZl IHJlYWwgZmlsZSBmb3IgbGlicmFyeSAtbEdMLgoKaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0Mzc2MwotLS0KIENoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8IDIwICsrKysrKysrKysrKysrKysrKysrCiBTb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgfCAyMyArKysrKysrKysrKysrKysr KysrKysrKwogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvT3BlbkdMU2hpbXMuY3Bw IHwgIDYgKysrLS0tCiBTb3VyY2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQgICAgICAg ICAgICAgfCAgNyArKysrKystCiA0IGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDcz YjE2ZmMuLmI3MjIwNTMgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMyBAQAorMjAxNS0wNC0xNSAg0KDRg9GB0LvQsNC9INCY0LbQsdGD0LvQsNGC0L7Q siAgPGxybjE5ODZAZ21haWwuY29tPgorCisgICAgICAgIENoYW5nZSBPcGVuR0wgY2hlY2tzIHRv IHdvcmsgb24gVzMyLCBhZGQgbGlib3BlbmdsMzIKKworICAgICAgICBBR2FpbiwgdXNlIE9TKFdJ TkRPV1MpIGZvciB0aGluZ3MgdGhhdCBhcmUgVzMyIGJ1dCBub3QgbmVjZXNzYXJpbHkgTVNWQy4K KyAgICAgICAgRG9uJ3QgdHJ5IHRvIGNoZWNrIGZvciBkbG9wZW4oKSBvbiBXMzIgKGl0IG1pZ2h0 IGJlIGF2YWlsYWJsZSwgYnV0CisgICAgICAgIG5hdGl2ZSBjb2RlIGlzIGFscmVhZHkgaGVyZSwg c28gdXNlIGl0KS4KKworICAgICAgICBDb3JyZWN0bHkgY2FzdCB0aGUgcmVzdWx0IG9mIEdldFBy b2NBZGRyZXNzKCksIGJlY2F1c2UgQysrLgorCisgICAgICAgIExpbmsgVzMyIHZlcnNpb24gdG8g LWxPcGVuR0wzMiBpbnN0ZWFkIG9mIC1sR0wsIG90aGVyd2lzZSBsaWJ0b29sIGNvbXBsYWluczoK KyAgICAgICAgKioqIFdhcm5pbmc6IGxpbmtlciBwYXRoIGRvZXMgbm90IGhhdmUgcmVhbCBmaWxl IGZvciBsaWJyYXJ5IC1sR0wuCisKKyAgICAgICAgW1czMl0gV3JvbmcgY29uZmlndXJlIHRlc3Rz IGZvciBPcGVuR0wgb24gV2luZG93cywgd3JvbmcgaWZkZWZzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM3NjMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVu ZGVuY2llcy5tNDoKKwogMjAxNS0wNC0wNyAgUGhpbGlwIENoaW1lbnRvICA8cGhpbGlwLmNoaW1l bnRvQGdtYWlsLmNvbT4KIAogICAgICAgICBjb25maWd1cmUgY2hlY2sgZm9yIGNsYW5nIHZlcnNp b24gaXMgaW5jb3JyZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDQ5MjBlNy4uNzE0ZDIyMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE1LTA0LTE1ICDQoNGD0YHQu9Cw0L0g0JjQttCx0YPQu9Cw 0YLQvtCyICA8bHJuMTk4NkBnbWFpbC5jb20+CiAKKyAgICAgICAgQ2hhbmdlIE9wZW5HTCBjaGVj a3MgdG8gd29yayBvbiBXMzIsIGFkZCBsaWJvcGVuZ2wzMgorCisgICAgICAgIEFHYWluLCB1c2Ug T1MoV0lORE9XUykgZm9yIHRoaW5ncyB0aGF0IGFyZSBXMzIgYnV0IG5vdCBuZWNlc3NhcmlseSBN U1ZDLgorICAgICAgICBEb24ndCB0cnkgdG8gY2hlY2sgZm9yIGRsb3BlbigpIG9uIFczMiAoaXQg bWlnaHQgYmUgYXZhaWxhYmxlLCBidXQKKyAgICAgICAgbmF0aXZlIGNvZGUgaXMgYWxyZWFkeSBo ZXJlLCBzbyB1c2UgaXQpLgorCisgICAgICAgIENvcnJlY3RseSBjYXN0IHRoZSByZXN1bHQgb2Yg R2V0UHJvY0FkZHJlc3MoKSwgYmVjYXVzZSBDKysuCisKKyAgICAgICAgTGluayBXMzIgdmVyc2lv biB0byAtbE9wZW5HTDMyIGluc3RlYWQgb2YgLWxHTCwgb3RoZXJ3aXNlIGxpYnRvb2wgY29tcGxh aW5zOgorICAgICAgICAqKiogV2FybmluZzogbGlua2VyIHBhdGggZG9lcyBub3QgaGF2ZSByZWFs IGZpbGUgZm9yIGxpYnJhcnkgLWxHTC4KKworICAgICAgICBbVzMyXSBXcm9uZyBjb25maWd1cmUg dGVzdHMgZm9yIE9wZW5HTCBvbiBXaW5kb3dzLCB3cm9uZyBpZmRlZnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mzc2MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvT3BlbkdMU2hpbXMuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Z2V0UHJvY0FkZHJlc3MpOgorCisyMDE1LTA0LTE1ICDQoNGD0YHQu9Cw0L0g0JjQ ttCx0YPQu9Cw0YLQvtCyICA8bHJuMTk4NkBnbWFpbC5jb20+CisKICAgICAgICAgRml4IGRlbGV0 ZU9iamVjdCBwcm90b3R5cHRlLCBmaXggaGVhZGVyIGNhc2UKIAogICAgICAgICBBcHBhcmVudGx5 LCA8VD4gaXMgdW5uZWVkZWQgaGVyZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL09wZW5HTFNoaW1zLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL09wZW5HTFNoaW1zLmNwcAppbmRleCA5MTZhOTA4Li5kNzdhOGIwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9PcGVuR0xTaGltcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvT3BlbkdMU2hpbXMuY3BwCkBAIC0yMiw3 ICsyMiw3IEBACiAjZGVmaW5lIERJU0FCTEVfU0hJTVMKICNpbmNsdWRlICJPcGVuR0xTaGltcy5o IgogCi0jaWYgIVBMQVRGT1JNKFdJTikKKyNpZiAhT1MoV0lORE9XUykKICNpbmNsdWRlIDxkbGZj bi5oPgogI2VuZGlmCiAKQEAgLTM3LDEwICszNywxMCBAQCBPcGVuR0xGdW5jdGlvblRhYmxlKiBv cGVuR0xGdW5jdGlvblRhYmxlKCkKICAgICByZXR1cm4gJnRhYmxlOwogfQogCi0jaWYgUExBVEZP Uk0oV0lOKQorI2lmIE9TKFdJTkRPV1MpCiBzdGF0aWMgdm9pZCogZ2V0UHJvY0FkZHJlc3MoY29u c3QgY2hhciogcHJvY05hbWUpCiB7Ci0gICAgcmV0dXJuIEdldFByb2NBZGRyZXNzKEdldE1vZHVs ZUhhbmRsZUEoImxpYkdMRVN2MiIpLCBwcm9jTmFtZSk7CisgICAgcmV0dXJuIHJlaW50ZXJwcmV0 X2Nhc3Q8dm9pZCo+KEdldFByb2NBZGRyZXNzKEdldE1vZHVsZUhhbmRsZUEoImxpYkdMRVN2MiIp LCBwcm9jTmFtZSkpOwogfQogI2Vsc2UKIHR5cGVkZWYgdm9pZCogKCpnbEdldFByb2NBZGRyZXNz VHlwZSkgKGNvbnN0IGNoYXIqIHByb2NOYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9hdXRvdG9v bHMvRmluZERlcGVuZGVuY2llcy5tNCBiL1NvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2ll cy5tNAppbmRleCA5YTJjNDk2Li4zY2UzZjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvYXV0b3Rvb2xz L0ZpbmREZXBlbmRlbmNpZXMubTQKKysrIGIvU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5j aWVzLm00CkBAIC00NTMsNiArNDUzLDkgQEAgaWYgdGVzdCAiJGZvdW5kX29wZW5nbCIgPSAieWVz IjsgdGhlbgogICAgIGlmIHRlc3QgIiRlbmFibGVfZ2xlczIiID0gInllcyI7IHRoZW4KICAgICAg ICAgYWNjZWxlcmF0aW9uX2Rlc2NyaXB0aW9uPSIkYWNjZWxlcmF0aW9uX2Rlc2NyaXB0aW9uIChn bGVzMiIKICAgICAgICAgT1BFTkdMX0xJQlM9Ii1sR0xFU3YyIgorICAgIGVsaWYgdGVzdCAiJG9z X3dpbjMyIiA9ICJ5ZXMiOyB0aGVuCisgICAgICAgIGFjY2VsZXJhdGlvbl9kZXNjcmlwdGlvbj0i JGFjY2VsZXJhdGlvbl9kZXNjcmlwdGlvbiAoZ2wiCisgICAgICAgIE9QRU5HTF9MSUJTPSItbG9w ZW5nbDMyIgogICAgIGVsc2UKICAgICAgICAgYWNjZWxlcmF0aW9uX2Rlc2NyaXB0aW9uPSIkYWNj ZWxlcmF0aW9uX2Rlc2NyaXB0aW9uIChnbCIKICAgICAgICAgT1BFTkdMX0xJQlM9Ii1sR0wiCkBA IC00NjcsNyArNDcwLDkgQEAgaWYgdGVzdCAiJGZvdW5kX29wZW5nbCIgPSAieWVzIjsgdGhlbgog CiAgICAgIyBDaGVjayB3aGV0aGVyIGRsb3BlbigpIGlzIGluIHRoZSBjb3JlIGxpYmMgbGlrZSBv biBGcmVlQlNELCBvciBpbiBhIHNlcGFyYXRlCiAgICAgIyBsaWJkbCBsaWtlIG9uIEdOVS9MaW51 eCAoaW4gd2hpY2ggY2FzZSB3ZSB3YW50IHRvIGxpbmsgdG8gbGliZGwpLgotICAgIEFDX0NIRUNL X0ZVTkMoW2Rsb3Blbl0sIFtdLCBbQUNfQ0hFQ0tfTElCKFtkbF0sIFtkbG9wZW5dLCBbT1BFTkdM X0xJQlM9IiRPUEVOR0xfTElCUyAtbGRsIl0pXSkKKyAgICBpZiB0ZXN0ICIkb3Nfd2luMzIiID0g Im5vIjsgdGhlbgorICAgICAgICBBQ19DSEVDS19GVU5DKFtkbG9wZW5dLCBbXSwgW0FDX0NIRUNL X0xJQihbZGxdLCBbZGxvcGVuXSwgW09QRU5HTF9MSUJTPSIkT1BFTkdMX0xJQlMgLWxkbCJdKV0p CisgICAgZmkKIAogICAgIGFjY2VsZXJhdGlvbl9kZXNjcmlwdGlvbj0iJGFjY2VsZXJhdGlvbl9k ZXNjcmlwdGlvbikiCiBmaQotLSAKMS44LjUuMw== 251067 2015-04-17 16:32:16 -0700 2015-04-17 16:32:16 -0700 wk patch wk.patch text/plain 839 mcrha ZGlmZiAtdXByIC14IC5kZXBzIC14IC5saWJzIC14ICcqLmxhJyAteCAnKi5sbycgd2Via2l0Z3Rr LTIuNC45Lm9yaWcvU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00IHdlYmtpdGd0 ay0yLjQuOS9Tb3VyY2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQKLS0tIHdlYmtpdGd0 ay0yLjQuOS5vcmlnL1NvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2llcy5tNAkyMDE1LTA0 LTA4IDE2OjI1OjI4ICswMDAwCisrKyB3ZWJraXRndGstMi40LjkvU291cmNlL2F1dG90b29scy9G aW5kRGVwZW5kZW5jaWVzLm00CTIwMTUtMDQtMDggMTc6MTE6MTYgKzAwMDAKQEAgLTQ1NSw3ICs0 NjEsMTQgQEAgaWYgdGVzdCAiJGZvdW5kX29wZW5nbCIgPSAieWVzIjsgdGhlbgogICAgICAgICBP UEVOR0xfTElCUz0iLWxHTEVTdjIiCiAgICAgZWxzZQogICAgICAgICBhY2NlbGVyYXRpb25fZGVz Y3JpcHRpb249IiRhY2NlbGVyYXRpb25fZGVzY3JpcHRpb24gKGdsIgotICAgICAgICBPUEVOR0xf TElCUz0iLWxHTCIKKyAgICAgICAgY2FzZSAiJGhvc3QiIGluCisgICAgICAgICAgICAqLSotbWlu Z3cqKQorICAgICAgICAgICAgICAgIE9QRU5HTF9MSUJTPSItbG9wZW5nbDMyIgorICAgICAgICAg ICAgICAgIDs7CisgICAgICAgICAgICAqKQorICAgICAgICAgICAgICAgIE9QRU5HTF9MSUJTPSIt bEdMIgorICAgICAgICAgICAgICAgIDs7CisgICAgICAgIGVzYWMKICAgICBmaQogICAgIGlmIHRl c3QgIiRlbmFibGVfZWdsIiA9ICJ5ZXMiOyB0aGVuCiAgICAgICAgIGFjY2VsZXJhdGlvbl9kZXNj cmlwdGlvbj0iJGFjY2VsZXJhdGlvbl9kZXNjcmlwdGlvbiwgZWdsIgo=