45504 2010-09-09 17:28:41 -0700 [chromium] Don't call deleteTexture on a texture attached to an FBO that is not currently bound 2010-09-09 20:25:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr kbr zmo oldest_to_newest 276866 0 jamesr 2010-09-09 17:28:41 -0700 [chromium] Don't call deleteTexture on a texture attached to an FBO that is not currently bound 276868 1 67123 jamesr 2010-09-09 17:32:01 -0700 Created attachment 67123 Patch 276869 2 jamesr 2010-09-09 17:33:12 -0700 Note that in addition to this not quite doing what we want, ANGLE currently crashes if you delete a texture attached to the non-current FBO. The ANGLE crash will be fixed as well. 276906 3 67123 kbr 2010-09-09 18:15:06 -0700 Comment on attachment 67123 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67123&action=prettypatch Basically looks fine. One comment. > WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:121 > + m_context->deleteTexture(m_internal->offscreenColorTexture); You don't really need to delete the texture and create a new one in this case. All you need is to call texImage2D against the texture object again to reallocate its storage to the new size. You might consider doing that instead. 276938 4 jamesr 2010-09-09 19:05:11 -0700 (In reply to comment #3) > (From update of attachment 67123 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=67123&action=prettypatch > > Basically looks fine. One comment. > > > WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:121 > > + m_context->deleteTexture(m_internal->offscreenColorTexture); > You don't really need to delete the texture and create a new one in this case. All you need is to call texImage2D against the texture object again to reallocate its storage to the new size. You might consider doing that instead. That's a very good point. I'll update the patch to do it that way instead. Do I have to respecify the texParameters()s after doing that? 276941 5 67138 jamesr 2010-09-09 19:08:44 -0700 Created attachment 67138 Patch 276943 6 jamesr 2010-09-09 19:10:49 -0700 Patch assumes I don't have to specify the texParameters again (which from basic testing appears to be the case). 276957 7 67138 kbr 2010-09-09 19:42:25 -0700 Comment on attachment 67138 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67138&action=prettypatch Looks good to me. To answer your question above, no, you don't need to respecify the texture parameters -- they are associated with the texture object, and you are not deleting that, only reallocating its associated texel storage. 276983 8 jamesr 2010-09-09 20:25:36 -0700 Committed r67156: <http://trac.webkit.org/changeset/67156> 67123 2010-09-09 17:32:01 -0700 2010-09-09 19:08:41 -0700 Patch bug-45504-20100909173200.patch text/plain 2660 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzdjNDJlNjU1OTMzZGI5MTllZTgyZGU1MDNhNmNiNzRjOTcxZTg1NS4uMzJhZGMwMjU3NDg5MGI1 Y2ZkYmMwMzRjMGY2M2EyY2QyOTViNDE3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0wOSAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRG9uJ3QgY2FsbCBkZWxldGVU ZXh0dXJlIG9uIGEgdGV4dHVyZSBhdHRhY2hlZCB0byBhbiBGQk8gdGhhdCBpcyBub3QgY3VycmVu dGx5IGJvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NTUwNAorCisgICAgICAgIFRoZSBPcGVuR0wgc2VtYW50aWNzIGZvciBnbERlbGV0ZVRleHR1 cmVzKCkgYXJlIHRoYXQgaWYgb25lIG9mIHRoZSBzcGVjaWZpZWQgdGV4dHVyZSBpcyBhdHRhY2hl ZAorICAgICAgICB0byB0aGUgY3VycmVudGx5IGJvdW5kIEZCTywgdGhhdCBGQk8ncyBjb2xvciBh dHRhY2htZW50IGlzIHJlbW92ZWQuICBIb3dldmVyLCBpZiB0aGUgc3BlY2lmaWVkCisgICAgICAg IHRleHR1cmUgaXMgYXR0YWNoZWQgdG8gYSBub24tY3VycmVudCBGQk8gdGhlbiBPcGVuR0wgc3Rh dGVzIGV4cGxpY2l0bHkgdGhhdCB0aGF0IEZCTydzIGNvbG9yCisgICAgICAgIGF0dGFjaG1lbnQg aXMgbm90IGNsZWFyZWQgYW5kIHRoYXQgdGhlIHRleHR1cmUgc3RheXMgYWxpdmUgZXZlbiB0aG91 Z2ggaXRzIElEIGlzIG5vIGxvbmdlcgorICAgICAgICB2YWxpZCB0byB1c2UuICBUaGlzIGlzIG5v dCB0aGUgYmVoYXZpb3Igd2Ugd2FudCBpbiBEcmF3aW5nQnVmZmVyIC0gd2UgYWN0dWFsbHkgd2Fu dCB0aGUKKyAgICAgICAgdGV4dHVyZSB0byBiZSBpbW1lZGlhdGVseSBkZWxldGVkLiAgVGhpcyBw YXRjaCBtYWtlcyBzdXJlIHRoZSBEcmF3aW5nQnVmZmVyJ3MgRkJPIGlzIGJvdW5kCisgICAgICAg IGJlZm9yZSBkZWxldGluZyBpdHMgY29sb3IgYXR0YWNobWVudCB0ZXh0dXJlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6On5EcmF3aW5nQnVmZmVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnJlc2V0KToKKwogMjAxMC0wOS0wOSAgQWxleGV5 IE1hcmluaWNoZXYgIDxhbWFyaW5pY2hldkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgSmFtZXMgUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKaW5kZXggODllODcw NTZkODZhYTgzM2RkOWFmNzRjYWIzMzEwNjVjYzVjNTIzMi4uMDQ5NWYyZTQyMzg1YWQzYjIyNTIz MDY0OWQwMWI3ODZjYzY1ZDgzMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcApAQCAtODgsNiAr ODgsOCBAQCBEcmF3aW5nQnVmZmVyOjp+RHJhd2luZ0J1ZmZlcigpCiAgICAgaWYgKG1faW50ZXJu YWwtPnBsYXRmb3JtTGF5ZXIpCiAgICAgICAgIG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXItPnNl dERyYXdpbmdCdWZmZXIoMCk7CiAjZW5kaWYKKyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZl cihtX2ZyYW1lYnVmZmVyKTsKKyAgICBtX2NvbnRleHQtPmRlbGV0ZVRleHR1cmUobV9pbnRlcm5h bC0+b2Zmc2NyZWVuQ29sb3JUZXh0dXJlKTsKICAgICBtX2NvbnRleHQtPmRlbGV0ZUZyYW1lYnVm ZmVyKG1fZnJhbWVidWZmZXIpOwogfQogCkBAIC0xMTMsOCArMTE1LDEwIEBAIHZvaWQgRHJhd2lu Z0J1ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKICAgICBpZiAobV9zaXplID09 IG5ld1NpemUpCiAgICAgICAgIHJldHVybjsKICAgICBtX3NpemUgPSBuZXdTaXplOwotICAgIG1f Y29udGV4dC0+ZGVsZXRlVGV4dHVyZShtX2ludGVybmFsLT5vZmZzY3JlZW5Db2xvclRleHR1cmUp OworICAgIC8vIEl0J3MgaW1wb3J0YW50IHRvIGJpbmQgdGhlIGZyYW1lYnVmZmVyIGJlZm9yZSBk ZWxldGluZyB0aGUgY29sb3IgYXR0YWNobWVudCB0ZXh0dXJlCisgICAgLy8gc28gdGhhdCB0aGUg b2xkIHRleHR1cmUgaXMgbm90IGxlZnQgZGFuZ2xpbmcuCiAgICAgbV9jb250ZXh0LT5iaW5kRnJh bWVidWZmZXIobV9mcmFtZWJ1ZmZlcik7CisgICAgbV9jb250ZXh0LT5kZWxldGVUZXh0dXJlKG1f aW50ZXJuYWwtPm9mZnNjcmVlbkNvbG9yVGV4dHVyZSk7CiAgICAgbV9pbnRlcm5hbC0+b2Zmc2Ny ZWVuQ29sb3JUZXh0dXJlID0gZ2VuZXJhdGVDb2xvclRleHR1cmUobV9jb250ZXh0LCBtX3NpemUp OwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQo= 67138 2010-09-09 19:08:44 -0700 2010-09-09 19:42:25 -0700 Patch bug-45504-20100909190843.patch text/plain 2765 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NzdjNDJlNjU1OTMzZGI5MTllZTgyZGU1MDNhNmNiNzRjOTcxZTg1NS4uMzJhZGMwMjU3NDg5MGI1 Y2ZkYmMwMzRjMGY2M2EyY2QyOTViNDE3OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0wOSAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gRG9uJ3QgY2FsbCBkZWxldGVU ZXh0dXJlIG9uIGEgdGV4dHVyZSBhdHRhY2hlZCB0byBhbiBGQk8gdGhhdCBpcyBub3QgY3VycmVu dGx5IGJvdW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00NTUwNAorCisgICAgICAgIFRoZSBPcGVuR0wgc2VtYW50aWNzIGZvciBnbERlbGV0ZVRleHR1 cmVzKCkgYXJlIHRoYXQgaWYgb25lIG9mIHRoZSBzcGVjaWZpZWQgdGV4dHVyZSBpcyBhdHRhY2hl ZAorICAgICAgICB0byB0aGUgY3VycmVudGx5IGJvdW5kIEZCTywgdGhhdCBGQk8ncyBjb2xvciBh dHRhY2htZW50IGlzIHJlbW92ZWQuICBIb3dldmVyLCBpZiB0aGUgc3BlY2lmaWVkCisgICAgICAg IHRleHR1cmUgaXMgYXR0YWNoZWQgdG8gYSBub24tY3VycmVudCBGQk8gdGhlbiBPcGVuR0wgc3Rh dGVzIGV4cGxpY2l0bHkgdGhhdCB0aGF0IEZCTydzIGNvbG9yCisgICAgICAgIGF0dGFjaG1lbnQg aXMgbm90IGNsZWFyZWQgYW5kIHRoYXQgdGhlIHRleHR1cmUgc3RheXMgYWxpdmUgZXZlbiB0aG91 Z2ggaXRzIElEIGlzIG5vIGxvbmdlcgorICAgICAgICB2YWxpZCB0byB1c2UuICBUaGlzIGlzIG5v dCB0aGUgYmVoYXZpb3Igd2Ugd2FudCBpbiBEcmF3aW5nQnVmZmVyIC0gd2UgYWN0dWFsbHkgd2Fu dCB0aGUKKyAgICAgICAgdGV4dHVyZSB0byBiZSBpbW1lZGlhdGVseSBkZWxldGVkLiAgVGhpcyBw YXRjaCBtYWtlcyBzdXJlIHRoZSBEcmF3aW5nQnVmZmVyJ3MgRkJPIGlzIGJvdW5kCisgICAgICAg IGJlZm9yZSBkZWxldGluZyBpdHMgY29sb3IgYXR0YWNobWVudCB0ZXh0dXJlLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6On5EcmF3aW5nQnVmZmVyKToKKyAgICAg ICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OnJlc2V0KToKKwogMjAxMC0wOS0wOSAgQWxleGV5 IE1hcmluaWNoZXYgIDxhbWFyaW5pY2hldkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgSmFtZXMgUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAgYi9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAKaW5kZXggODllODcw NTZkODZhYTgzM2RkOWFmNzRjYWIzMzEwNjVjYzVjNTIzMi4uNjQ5ODFlZTE4NmFlNjkxNTEwMDNi ZDU4M2ExNTZiMzZjZGU3NmMxYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVtLmNwcApAQCAtODgsNiAr ODgsOCBAQCBEcmF3aW5nQnVmZmVyOjp+RHJhd2luZ0J1ZmZlcigpCiAgICAgaWYgKG1faW50ZXJu YWwtPnBsYXRmb3JtTGF5ZXIpCiAgICAgICAgIG1faW50ZXJuYWwtPnBsYXRmb3JtTGF5ZXItPnNl dERyYXdpbmdCdWZmZXIoMCk7CiAjZW5kaWYKKyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZl cihtX2ZyYW1lYnVmZmVyKTsKKyAgICBtX2NvbnRleHQtPmRlbGV0ZVRleHR1cmUobV9pbnRlcm5h bC0+b2Zmc2NyZWVuQ29sb3JUZXh0dXJlKTsKICAgICBtX2NvbnRleHQtPmRlbGV0ZUZyYW1lYnVm ZmVyKG1fZnJhbWVidWZmZXIpOwogfQogCkBAIC0xMTMsOSArMTE1LDkgQEAgdm9pZCBEcmF3aW5n QnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogICAgIGlmIChtX3NpemUgPT0g bmV3U2l6ZSkKICAgICAgICAgcmV0dXJuOwogICAgIG1fc2l6ZSA9IG5ld1NpemU7Ci0gICAgbV9j b250ZXh0LT5kZWxldGVUZXh0dXJlKG1faW50ZXJuYWwtPm9mZnNjcmVlbkNvbG9yVGV4dHVyZSk7 Ci0gICAgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIobV9mcmFtZWJ1ZmZlcik7Ci0gICAgbV9p bnRlcm5hbC0+b2Zmc2NyZWVuQ29sb3JUZXh0dXJlID0gZ2VuZXJhdGVDb2xvclRleHR1cmUobV9j b250ZXh0LCBtX3NpemUpOworCisgICAgbV9jb250ZXh0LT5iaW5kVGV4dHVyZShHcmFwaGljc0Nv bnRleHQzRDo6VEVYVFVSRV8yRCwgbV9pbnRlcm5hbC0+b2Zmc2NyZWVuQ29sb3JUZXh0dXJlKTsK KyAgICBtX2NvbnRleHQtPnRleEltYWdlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OlRFWFRVUkVfMkQs IDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBtX3NpemUud2lkdGgoKSwgbV9zaXplLmhlaWdo dCgpLCAwLCBHcmFwaGljc0NvbnRleHQzRDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lH TkVEX0JZVEUsIDApOwogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlm IChtX2ludGVybmFsLT5wbGF0Zm9ybUxheWVyKQo=