47307 2010-10-06 15:08:28 -0700 Remove support for ANGLE SH_VERSION <= 100 2010-10-12 18:23:52 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 47381 1 alokp alokp commit-queue jamesr kbr zmo oldest_to_newest 290603 0 alokp 2010-10-06 15:08:28 -0700 Now that ANGLE version has been rolled to r443 we do not need to support SH_VERSION <= 100. The code that's been affected is in ${WebKitRoot}/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp for functions angleCreateCompilers angleValidateShaderSource() 290611 1 69998 alokp 2010-10-06 15:17:13 -0700 Created attachment 69998 proposed patch 290634 2 69998 kbr 2010-10-06 15:56:38 -0700 Comment on attachment 69998 proposed patch You will need to first roll forward the Chromium deps in WebKit (used to build the DumpRenderTree tool, which depends on this code) to a version containing the rolled-forward ANGLE. I suggest filing a separate bug for that and making this one dependent on it. The file is WebKit/chromium/DEPS, chromium_rev. You can verify that the roll-forward succeeds via "build-webkit --chromium --debug". Mark this r? again once this is done. 291373 3 zmo 2010-10-07 18:19:20 -0700 have you rolled already? If not, could you include chroium r61902? 291415 4 zmo 2010-10-07 19:54:19 -0700 Ignore this. I just rolled myself. (In reply to comment #3) > have you rolled already? If not, could you include chroium r61902? 293143 5 alokp 2010-10-12 15:35:40 -0700 The Chromium DEPS in WebKit has been rolled forward to pull the latest version of ANGLE. 293234 6 69998 kbr 2010-10-12 18:07:20 -0700 Comment on attachment 69998 proposed patch Thanks. Looks good to me. 293239 7 69998 commit-queue 2010-10-12 18:23:47 -0700 Comment on attachment 69998 proposed patch Clearing flags on attachment: 69998 Committed r69627: <http://trac.webkit.org/changeset/69627> 293240 8 commit-queue 2010-10-12 18:23:52 -0700 All reviewed patches have been landed. Closing bug. 69998 2010-10-06 15:17:13 -0700 2010-10-12 18:23:47 -0700 proposed patch angle100.txt text/plain 2677 alokp SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjkyMzkpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDYgIEFsb2sg cHJpeWFkYXJzaGkgIDxhbG9rcEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIHN1cHBvcnQgZm9yIEFOR0xFIFNIX1ZF UlNJT04gPD0gMTAwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NzMwNworCisgICAgICAgICogc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBs OjphbmdsZUNyZWF0ZUNvbXBpbGVycyk6CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29u dGV4dDNERGVmYXVsdEltcGw6OmFuZ2xlVmFsaWRhdGVTaGFkZXJTb3VyY2UpOgorCiAyMDEwLTEw LTA1ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE5hdGUgQ2hhcGluLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGlj c0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuY3BwCShyZXZpc2lvbiA2OTIzNikK KysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MTQsMTMgKzE0MTQsOCBAQCBib29sIFdlYkdyYXBoaWNz Q29udGV4dDNERGVmYXVsdEltcGw6OmFuCiAgICAgaWYgKCFTaEluaXRpYWxpemUoKSkKICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCi0jaWYgZGVmaW5lZChTSF9WRVJTSU9OKSAmJiAoU0hfVkVSU0lP TiA+IDEwMCkKICAgICBTaEJ1aWx0SW5SZXNvdXJjZXMgcmVzb3VyY2VzOwogICAgIFNoSW5pdEJ1 aWx0SW5SZXNvdXJjZXMoJnJlc291cmNlcyk7Ci0jZWxzZQotICAgIFRCdWlsdEluUmVzb3VyY2Ug cmVzb3VyY2VzOwotICAgIFNoSW5pdEJ1aWx0SW5SZXNvdXJjZSgmcmVzb3VyY2VzKTsKLSNlbmRp ZiAvLyBTSF9WRVJTSU9OCiAgICAgZ2V0SW50ZWdlcnYoR0xfTUFYX1ZFUlRFWF9BVFRSSUJTLCAm cmVzb3VyY2VzLk1heFZlcnRleEF0dHJpYnMpOwogICAgIGdldEludGVnZXJ2KE1BWF9WRVJURVhf VU5JRk9STV9WRUNUT1JTLCAmcmVzb3VyY2VzLk1heFZlcnRleFVuaWZvcm1WZWN0b3JzKTsKICAg ICBnZXRJbnRlZ2VydihNQVhfVkFSWUlOR19WRUNUT1JTLCAmcmVzb3VyY2VzLk1heFZhcnlpbmdW ZWN0b3JzKTsKQEAgLTE0MzEsMTMgKzE0MjYsOCBAQCBib29sIFdlYkdyYXBoaWNzQ29udGV4dDNE RGVmYXVsdEltcGw6OmFuCiAgICAgLy8gQWx3YXlzIHNldCB0byAxIGZvciBPcGVuR0wgRVMuCiAg ICAgcmVzb3VyY2VzLk1heERyYXdCdWZmZXJzID0gMTsKIAotI2lmIGRlZmluZWQoU0hfVkVSU0lP TikgJiYgKFNIX1ZFUlNJT04gPiAxMDApCiAgICAgbV9mcmFnbWVudENvbXBpbGVyID0gU2hDb25z dHJ1Y3RDb21waWxlcihTSF9GUkFHTUVOVF9TSEFERVIsIFNIX1dFQkdMX1NQRUMsICZyZXNvdXJj ZXMpOwogICAgIG1fdmVydGV4Q29tcGlsZXIgPSBTaENvbnN0cnVjdENvbXBpbGVyKFNIX1ZFUlRF WF9TSEFERVIsIFNIX1dFQkdMX1NQRUMsICZyZXNvdXJjZXMpOwotI2Vsc2UKLSAgICBtX2ZyYWdt ZW50Q29tcGlsZXIgPSBTaENvbnN0cnVjdENvbXBpbGVyKEVTaExhbmdGcmFnbWVudCwgRVNoU3Bl Y1dlYkdMLCAmcmVzb3VyY2VzKTsKLSAgICBtX3ZlcnRleENvbXBpbGVyID0gU2hDb25zdHJ1Y3RD b21waWxlcihFU2hMYW5nVmVydGV4LCBFU2hTcGVjV2ViR0wsICZyZXNvdXJjZXMpOwotI2VuZGlm IC8vIFNIX1ZFUlNJT04KICAgICByZXR1cm4gKG1fZnJhZ21lbnRDb21waWxlciAmJiBtX3ZlcnRl eENvbXBpbGVyKTsKIH0KIApAQCAtMTQ3NywxMSArMTQ2Nyw3IEBAIGJvb2wgV2ViR3JhcGhpY3ND b250ZXh0M0REZWZhdWx0SW1wbDo6YW4KICAgICBpZiAoIWNvbXBpbGVyKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSNpZiBkZWZpbmVkKFNIX1ZFUlNJT04pICYmIChTSF9WRVJTSU9OID4gMTAw KQogICAgIGlmICghU2hDb21waWxlKGNvbXBpbGVyLCAmZW50cnkuc291cmNlLCAxLCBTSF9PQkpF Q1RfQ09ERSkpIHsKLSNlbHNlCi0gICAgaWYgKCFTaENvbXBpbGUoY29tcGlsZXIsICZlbnRyeS5z b3VyY2UsIDEsIEVTaE9wdE9iamVjdENvZGUpKSB7Ci0jZW5kaWYgLy8gU0hfVkVSU0lPTgogICAg ICAgICBpbnQgbG9nU2l6ZSA9IDA7CiAgICAgICAgIFNoR2V0SW5mbyhjb21waWxlciwgU0hfSU5G T19MT0dfTEVOR1RILCAmbG9nU2l6ZSk7CiAgICAgICAgIGlmIChsb2dTaXplID4gMSAmJiB0cnlG YXN0TWFsbG9jKGxvZ1NpemUgKiBzaXplb2YoY2hhcikpLmdldFZhbHVlKGVudHJ5LmxvZykpCg==