87032 2012-05-21 11:19:42 -0700 Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer() 2012-05-21 14:00:26 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zmo zmo cc-bugs gman jamesr kbr twiz webkit.review.bot oldest_to_newest 629289 0 zmo 2012-05-21 11:19:42 -0700 This is regressed again. Last time I added restoreFramebufferBinding(), now this function is no longer called anywhere, and apparently that caused the binding to be lost. 629308 1 143066 zmo 2012-05-21 11:39:24 -0700 Created attachment 143066 Patch 629312 2 zmo 2012-05-21 11:40:25 -0700 Please review. Once this lands and webkit rolls, I'll make sure to enable related webgl conformance tests in chromium immediately. 629324 3 143066 jamesr 2012-05-21 11:48:08 -0700 Comment on attachment 143066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143066&action=review > Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:138 > if (multisample()) > bind(); > + > + restoreFramebufferBinding(); Something here is clearly wrong. line 136 is binding m_multisampleFBO ? m_multisampleFBO : m_fbo. Line 138 is binding m_framebufferBinding. We should make up our mind and just bind one. 629413 4 143083 zmo 2012-05-21 13:04:56 -0700 Created attachment 143083 Patch 629414 5 zmo 2012-05-21 13:05:18 -0700 Revised, please have another look. 629423 6 143083 jamesr 2012-05-21 13:16:37 -0700 Comment on attachment 143083 Patch Thanks, that does look better. 629457 7 143083 kbr 2012-05-21 13:49:33 -0700 Comment on attachment 143083 Patch Looks fine to me too. 629474 8 zmo 2012-05-21 14:00:26 -0700 Committed r117814: <http://trac.webkit.org/changeset/117814> 143066 2012-05-21 11:39:24 -0700 2012-05-21 13:04:52 -0700 Patch bug-87032-20120521113922.patch text/plain 1275 zmo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzgwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTIxICBaaGVueWFv IE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVzdG9yZSBXZWJHTCdzIGZyYW1lYnVm ZmVyIGJpbmRpbmcgYWZ0ZXIgRHJhd2luZ0J1ZmZlcidzIHByZXBhcmVCYWNrQnVmZmVyKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDMyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHJhd2luZ0J1ZmZlcjo6cHJlcGFyZUJhY2tCdWZmZXIpOiByZXN0b3JlIHRoZSB1c2Vy J3MgZnJhbWVidWZmZXIgYmluZGluZyBpZiB0aGVyZSBpcyBvbmUuCisKIDIwMTItMDUtMjEgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVmYWN0b3IgcmV2aXNpb24gaGlzdG9yeSB0byBub3QgaW5jbHVkZSByZXNvdXJjZSBp dHNlbGYuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9E cmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHJldmlz aW9uIDExNzQ4OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNCw2ICsxMzQs OCBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OnByZXBhcmVCYWNrQnVmZmVyKCkKIAogICAgIGlmICht dWx0aXNhbXBsZSgpKQogICAgICAgICBiaW5kKCk7CisKKyAgICByZXN0b3JlRnJhbWVidWZmZXJC aW5kaW5nKCk7CiB9CiAKIGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVxdWlyZXNDb3B5RnJvbUJhY2tU b0Zyb250QnVmZmVyKCkgY29uc3QK 143083 2012-05-21 13:04:56 -0700 2012-05-21 13:49:33 -0700 Patch bug-87032-20120521130455.patch text/plain 1505 zmo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzgwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTIxICBaaGVueWFv IE1vICA8em1vQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmVzdG9yZSBXZWJHTCdzIGZyYW1lYnVm ZmVyIGJpbmRpbmcgYWZ0ZXIgRHJhd2luZ0J1ZmZlcidzIHByZXBhcmVCYWNrQnVmZmVyKCkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDMyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RHJhd2luZ0J1ZmZlcjo6cHJlcGFyZUJhY2tCdWZmZXIpOiByZXN0b3JlIHRoZSB1c2Vy J3MgZnJhbWVidWZmZXIgYmluZGluZyBpZiB0aGVyZSBpcyBvbmUuCisKIDIwMTItMDUtMjEgIFBh dmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogcmVmYWN0b3IgcmV2aXNpb24gaGlzdG9yeSB0byBub3QgaW5jbHVkZSByZXNvdXJjZSBp dHNlbGYuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9E cmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHJldmlz aW9uIDExNzQ4OCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0RyYXdpbmdCdWZmZXJDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzMiw4ICsxMzIs MTAgQEAgdm9pZCBEcmF3aW5nQnVmZmVyOjpwcmVwYXJlQmFja0J1ZmZlcigpCiAgICAgICAgIG1f Y29udGV4dC0+ZnJhbWVidWZmZXJUZXh0dXJlMkQoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVG RkVSLCBHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4 dDNEOjpURVhUVVJFXzJELCBtX2NvbG9yQnVmZmVyLCAwKTsKICAgICB9CiAKLSAgICBpZiAobXVs dGlzYW1wbGUoKSkKKyAgICBpZiAobXVsdGlzYW1wbGUoKSAmJiAhbV9mcmFtZWJ1ZmZlckJpbmRp bmcpCiAgICAgICAgIGJpbmQoKTsKKyAgICBlbHNlCisgICAgICAgIHJlc3RvcmVGcmFtZWJ1ZmZl ckJpbmRpbmcoKTsKIH0KIAogYm9vbCBEcmF3aW5nQnVmZmVyOjpyZXF1aXJlc0NvcHlGcm9tQmFj a1RvRnJvbnRCdWZmZXIoKSBjb25zdAo=