45316 2010-09-07 12:13:04 -0700 Regression in JPEG texture uploads on Mac OS X 2010-09-07 15:58:51 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P1 Normal --- 44566 45332 1 kbr kbr cmarrin zmo oldest_to_newest 275204 0 kbr 2010-09-07 12:13:04 -0700 The fix for the longstanding premultiplied alpha issue in https://bugs.webkit.org/show_bug.cgi?id=44566 has introduced a regression when uploading textures using the Core Graphics format kCGImageAlphaNoneSkipLast. The issue is a missing break statement in a nested switch. 275287 1 66765 kbr 2010-09-07 14:20:16 -0700 Created attachment 66765 Patch From the ChangeLog: Fixed regression introduced in https://bugs.webkit.org/show_bug.cgi?id=44566 . Added regression test covering this case to gl-teximage.html in Khronos repository and synced test with WebKit's version. 275290 2 66765 dglazkov 2010-09-07 14:21:50 -0700 Comment on attachment 66765 Patch ok. 275291 3 kbr 2010-09-07 14:24:31 -0700 Committed r66908: <http://trac.webkit.org/changeset/66908> 66765 2010-09-07 14:20:16 -0700 2010-09-07 14:21:50 -0700 Patch non-alpha-teximage2d.patch text/plain 6105 kbr SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NjkwNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMDcgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl Z3Jlc3Npb24gaW4gSlBFRyB0ZXh0dXJlIHVwbG9hZHMgb24gTWFjIE9TIFgKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MzE2CisKKyAgICAgICAgRml4 ZWQgcmVncmVzc2lvbiBpbnRyb2R1Y2VkIGluCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD00NDU2NiAuIEFkZGVkIHJlZ3Jlc3Npb24KKyAgICAgICAgdGVz dCBjb3ZlcmluZyB0aGlzIGNhc2UgdG8gZ2wtdGV4aW1hZ2UuaHRtbCBpbiBLaHJvbm9zIHJlcG9z aXRvcnkKKyAgICAgICAgYW5kIHN5bmNlZCB0ZXN0IHdpdGggV2ViS2l0J3MgdmVyc2lvbi4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YSk6CisKIDIw MTAtMDktMDcgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAg ICAgIEFkZCByZW5kZXJpbmcvQ29sdW1uSW5mby5oIHRvIHRoZSBzb3VyY2VzIGxpc3QuCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0dyYXBoaWNzQ29udGV4dDNEQ0cuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2cvR3JhcGhpY3NDb250ZXh0 M0RDRy5jcHAJKHJldmlzaW9uIDY2ODkyKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9HcmFwaGljc0NvbnRleHQzRENHLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE5LDYgKzExOSw3 IEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OmdldEltYWdlRGF0YShJbWEKICAgICAgICAgZGVm YXVsdDoKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQorICAgICAgICBicmVh azsKICAgICBjYXNlIGtDR0ltYWdlQWxwaGFOb25lOgogICAgICAgICBzd2l0Y2ggKGNvbXBvbmVu dHNQZXJQaXhlbCkgewogICAgICAgICBjYXNlIDE6CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA2NjkwNykK KysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDEwLTA5LTA3ICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWdyZXNzaW9uIGluIEpQ RUcgdGV4dHVyZSB1cGxvYWRzIG9uIE1hYyBPUyBYCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTMxNgorCisgICAgICAgIEZpeGVkIHJlZ3Jlc3Npb24g aW50cm9kdWNlZCBpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDQ1NjYgLiBBZGRlZCByZWdyZXNzaW9uCisgICAgICAgIHRlc3QgY292ZXJpbmcgdGhp cyBjYXNlIHRvIGdsLXRleGltYWdlLmh0bWwgaW4gS2hyb25vcyByZXBvc2l0b3J5CisgICAgICAg IGFuZCBzeW5jZWQgdGVzdCB3aXRoIFdlYktpdCdzIHZlcnNpb24uCisKKyAgICAgICAgKiBmYXN0 L2NhbnZhcy93ZWJnbC9nbC10ZXhpbWFnZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9j YW52YXMvd2ViZ2wvZ2wtdGV4aW1hZ2UuaHRtbDoKKyAgICAgICAgKiBmYXN0L2NhbnZhcy93ZWJn bC9yZXNvdXJjZXMvYmx1ZS0xeDEuanBnOiBBZGRlZC4KKwogMjAxMC0wOS0wNyAgRGFuIEJlcm5z dGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQu CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbC10ZXhpbWFnZS1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvZ2wtdGV4 aW1hZ2UtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiA2Njg5MikKKysrIExheW91dFRlc3RzL2Zhc3Qv Y2FudmFzL3dlYmdsL2dsLXRleGltYWdlLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAt NjIsNiArNjIsMTAgQEAgUEFTUyBwaXhlbCAyNTUsIDggc2hvdWxkIGJlIDAsIDI1NSwgMCwgMgog UEFTUyBwaXhlbCAwLCAwIHNob3VsZCBiZSAwLCAwLCAwLCAyNTUgd2FzIDAsIDAsIDAsIDI1NQog UEFTUyBwaXhlbCAxMjgsIDAgc2hvdWxkIGJlIDAsIDAsIDI1NSwgMjU1IHdhcyAwLCAwLCAyNTUs IDI1NQogUEFTUyBwaXhlbCAyNTUsIDAgc2hvdWxkIGJlIDI1NSwgMCwgMCwgMjU1IHdhcyAyNTUs IDAsIDAsIDI1NQorCitjaGVjayB1cGxvYWRpbmcgb2YgaW1hZ2VzIHdpdGggbm8gYWxwaGEgY2hh bm5lbCB3b3JrcworUEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IE5PX0VSUk9SIDog U2hvdWxkIGJlIG5vIGVycm9ycyBmcm9tIHNldHVwCitQQVNTIHBpeGVsIDEyOCwgOCBzaG91bGQg YmUgd2l0aGluIDEwIHVuaXRzIG9mIDAsIDAsIDI1NSwgMjU1IHdhcyAwLCAwLCAyNTQsIDI1NQog UEFTUyBnZXRFcnJvciB3YXMgZXhwZWN0ZWQgdmFsdWU6IE5PX0VSUk9SIDogU2hvdWxkIGJlIG5v IGVycm9ycwogCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L2NhbnZhcy93ZWJnbC9nbC10ZXhpbWFnZS5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL2dsLXRleGltYWdlLmh0bWwJKHJldmlzaW9uIDY2 ODkyKQorKysgTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvZ2wtdGV4aW1hZ2UuaHRtbAko d29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsOCBAQCB2YXIgaW1nVVJMcyA9IFsKICAgJ3Jlc291 cmNlcy9ncmF5LXJhbXAtZ2FtbWE5LjAucG5nJywKICAgJ3Jlc291cmNlcy9ncmF5LXJhbXAucG5n JywKICAgJ3Jlc291cmNlcy96ZXJvLWFscGhhLnBuZycsCi0gICdyZXNvdXJjZXMvM3gzLnBuZydd OworICAncmVzb3VyY2VzLzN4My5wbmcnLAorICAncmVzb3VyY2VzL2JsdWUtMXgxLmpwZyddOwog CiB3dHUubG9hZEltYWdlc0FzeW5jKGltZ1VSTHMsIHJ1blRlc3RzKTsKIApAQCAtNjgsNiArNjks MjggQEAgZnVuY3Rpb24gcnVuVGVzdHMoaW1ncykgewogICAgIHRlc3RQYXNzZWQobXNnKTsKICAg fQogCisgIGZ1bmN0aW9uIGNoZWNrUGl4ZWxSYW5nZShidWYsIHgsIHksIGNvbG9yLCBhbGxvd2Vk UmFuZ2UpIHsKKyAgICB2YXIgb2ZmID0gKHkgKiB3aWR0aCArIHgpICogNDsKKyAgICB2YXIgbXNn ID0gInBpeGVsICIgKyB4ICsgIiwgIiArIHkgKyAiIHNob3VsZCBiZSB3aXRoaW4gIiArCisgICAg ICAgICAgICAgIGFsbG93ZWRSYW5nZSArICIgdW5pdHMgb2YgIiArCisgICAgICAgICAgICAgIGNv bG9yWzBdICsgIiwgIiArCisgICAgICAgICAgICAgIGNvbG9yWzFdICsgIiwgIiArCisgICAgICAg ICAgICAgIGNvbG9yWzJdICsgIiwgIiArCisgICAgICAgICAgICAgIGNvbG9yWzNdICsgIiB3YXMg IiArCisgICAgICAgICAgICAgIGJ1ZltvZmYgKyAwXSArICIsICIgKworICAgICAgICAgICAgICBi dWZbb2ZmICsgMV0gKyAiLCAiICsKKyAgICAgICAgICAgICAgYnVmW29mZiArIDJdICsgIiwgIiAr CisgICAgICAgICAgICAgIGJ1ZltvZmYgKyAzXTsKKworICAgIGZvciAodmFyIGlpID0gMDsgaWkg PCA0OyArK2lpKSB7CisgICAgICBpZiAoTWF0aC5hYnMoYnVmW29mZiArIGlpXSAtIGNvbG9yW2lp XSkgPiBhbGxvd2VkUmFuZ2UpIHsKKyAgICAgICAgdGVzdEZhaWxlZChtc2cpOworICAgICAgICBy ZXR1cm47CisgICAgICB9CisgICAgfQorICAgIHRlc3RQYXNzZWQobXNnKTsKKyAgfQorCiAgIHZh ciB0ZXggPSBnbC5jcmVhdGVUZXh0dXJlKCk7CiAgIGdsLmJpbmRUZXh0dXJlKGdsLlRFWFRVUkVf MkQsIHRleCk7CiAgIGdsLnRleFBhcmFtZXRlcmkoZ2wuVEVYVFVSRV8yRCwgZ2wuVEVYVFVSRV9X UkFQX1MsIGdsLkNMQU1QX1RPX0VER0UpOwpAQCAtMjUxLDYgKzI3NCwxOCBAQCBmdW5jdGlvbiBy dW5UZXN0cyhpbWdzKSB7CiAgIGNoZWNrUGl4ZWwoYnVmLCBtaWRkbGUsIGJvdHRvbSwgWyAgMCwg ICAwLCAyNTUsIDI1NV0pOwogICBjaGVja1BpeGVsKGJ1ZiwgcmlnaHQsICBib3R0b20sIFsyNTUs ICAgMCwgICAwLCAyNTVdKTsKIAorICBkZWJ1ZygiIik7CisgIGRlYnVnKCJjaGVjayB1cGxvYWRp bmcgb2YgaW1hZ2VzIHdpdGggbm8gYWxwaGEgY2hhbm5lbCB3b3JrcyIpOworICBnbC5waXhlbFN0 b3JlaShnbC5VTlBBQ0tfUFJFTVVMVElQTFlfQUxQSEFfV0VCR0wsIGZhbHNlKTsKKyAgZ2wucGl4 ZWxTdG9yZWkoZ2wuVU5QQUNLX0ZMSVBfWV9XRUJHTCwgZmFsc2UpOworICBnbC50ZXhJbWFnZTJE KGdsLlRFWFRVUkVfMkQsIDAsIGdsLlJHQiwgZ2wuUkdCLCBnbC5VTlNJR05FRF9CWVRFLAorICAg ICAgICAgICAgICAgIGltZ3NbJ3Jlc291cmNlcy9ibHVlLTF4MS5qcGcnXSk7CisgIGdsRXJyb3JT aG91bGRCZShnbCwgZ2wuTk9fRVJST1IsICJTaG91bGQgYmUgbm8gZXJyb3JzIGZyb20gc2V0dXAi KTsKKyAgd3R1LmRyYXdRdWFkKGdsKTsKKyAgZ2wucmVhZFBpeGVscygwLCAwLCB3aWR0aCwgaGVp Z2h0LCBnbC5SR0JBLCBnbC5VTlNJR05FRF9CWVRFLCBidWYpOworCisgIGNoZWNrUGl4ZWxSYW5n ZShidWYsIG1pZGRsZSwgY2VudGVyLCBbICAgMCwgICAwLCAyNTUsIDI1NV0sIDEwKTsKKwogICBn bEVycm9yU2hvdWxkQmUoZ2wsIGdsLk5PX0VSUk9SLCAiU2hvdWxkIGJlIG5vIGVycm9ycyIpOwog CiAgIGRlYnVnKCIiKTsKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY2FudmFzL3dlYmdsL3Jlc291 cmNlcy9ibHVlLTF4MS5qcGcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpDYW5ub3QgZGlzcGxheTogZmlsZSBtYXJrZWQg YXMgYSBiaW5hcnkgdHlwZS4Kc3ZuOm1pbWUtdHlwZSA9IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVh bQoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9jYW52YXMvd2ViZ2wvcmVz b3VyY2VzL2JsdWUtMXgxLmpwZwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiAgICsg YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtCgoKLzlqLzRBQVFTa1pKUmdBQkFRRUFTQUJJQUFELy9n QWNRM0psWVhSbFpDQjNhWFJvSUVkSlRWQWdiMjRnWVNCTllXUC8yd0JEQUFFQgpBUUVCQVFFQkFR RUJBUUVCQVFFQkFRRUJBUUVCQVFFQkFRRUJBUUVCQVFFQkFRRUJBUUVCQVFFQkFRRUJBUUVCQVFF QkFRRUJBUUVCCkFRRUJBUUgvMndCREFRRUJBUUVCQVFFQkFRRUJBUUVCQVFFQkFRRUJBUUVCQVFF QkFRRUJBUUVCQVFFQkFRRUJBUUVCQVFFQkFRRUIKQVFFQkFRRUJBUUVCQVFFQkFRRUJBUUgvd0FB UkNBQUJBQUVEQVNJQUFoRUJBeEVCLzhRQUZRQUJBUUFBQUFBQUFBQUFBQUFBQUFBQQpBQXIveEFB VUVBRUFBQUFBQUFBQUFBQUFBQUFBQUFBQS84UUFGUUVCQVFBQUFBQUFBQUFBQUFBQUFBQUFDQXIv eEFBVUVRRUFBQUFBCkFBQUFBQUFBQUFBQUFBQUEvOW9BREFNQkFBSVJBeEVBUHdDT2NCZndLNy8v MlE9PQoK