126470 2014-01-03 16:24:41 -0800 [WebGL] Blit operation from Multisample FBO to rendering FBO must ignore GL_SCISSOR test 2014-01-03 16:48:30 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dino kondapallykalyan noam roger_fong oldest_to_newest 964319 0 bfulgham 2014-01-03 16:24:41 -0800 When we use Multisampling to antialias our drawing, we have to Blit from the multisample buffers into the FBO used for rendering to screen. The drawing portion of this bug was corrected by Bug 126455. However, WebGL code that used glGetPixels would still fail, because the pixel read operations were being done on a buffer that was only partially initialized. The fix is to make sure our "resolveMultisamplingIfNecessary" operation deactivates the GL_SCISSOR test so that we blit the entire buffer, not just whatever region of memory is activated by the scissor region. 964320 1 220352 bfulgham 2014-01-03 16:30:12 -0800 Created attachment 220352 Patch 964321 2 commit-queue 2014-01-03 16:32:06 -0800 Attachment 220352 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp', '--commit-queue']" exit_code: 1 ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:165: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:166: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:167: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:167: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:179: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:181: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] Total errors found: 6 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 964322 3 bfulgham 2014-01-03 16:32:55 -0800 (In reply to comment #2) > Attachment 220352 [details] did not pass style-queue: > > Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp', '--commit-queue']" exit_code: 1 > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:165: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:166: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:167: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:167: Wrong number of spaces before statement. (expected: 8) [whitespace/indent] [4] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:179: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > ERROR: Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:181: Wrong number of spaces before statement. (expected: 12) [whitespace/indent] [4] > Total errors found: 6 in 2 files > More false positives. 964328 4 bfulgham 2014-01-03 16:48:30 -0800 Committed r161297: <http://trac.webkit.org/changeset/161297> 220352 2014-01-03 16:30:12 -0800 2014-01-03 16:39:56 -0800 Patch bug-126470-20140103163011.patch text/plain 2371 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTI5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAxLTAzICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gQmxpdCBvcGVy YXRpb24gZnJvbSBNdWx0aXNhbXBsZSBGQk8gdG8gcmVuZGVyaW5nIEZCTyBtdXN0IGlnbm9yZSBH TF9TQ0lTU09SIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjQ3MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTUyMDEzNzA+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ292ZXJlZCBieSB3ZWJn bC8xLjAuMi9yZXNvdXJjZXMvd2ViZ2xfdGVzdF9maWxlcy9jb25mb3JtYW5jZS9yZW5kZXJpbmcv Z2wtc2Npc3Nvci10ZXN0Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5n bC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGlj c0NvbnRleHQzRDo6cmVzb2x2ZU11bHRpc2FtcGxpbmdJZk5lY2Vzc2FyeSk6IFRlbXBvcmFyaWx5 IGRlYWN0aXZhdGUgdGhlIEdMX1NDSVNTT1IKKyAgICAgICAgdGVzdCB3aGlsZSB3ZSBkbyBvdXIg YmxpdCwgdGhlbiByZWFjdGl2YXRlIGlmIG5lY2Vzc2FyeS4KKwogMjAxNC0wMS0wMyAgQnJlbnQg RnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR0xdIENHTFBpeGVs Rm9ybWF0IHNob3VsZCBzcGVjaWZ5IFNhbXBsZUJ1ZmZlciBhbmQgU2FtcGxlIGNvdW50IHdoZW4g dXNpbmcgTVNBQQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3Blbmds L0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0wuY3BwCShy ZXZpc2lvbiAxNjEyOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVu Z2wvR3JhcGhpY3NDb250ZXh0M0RPcGVuR0wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjEsNiAr MTYxLDExIEBAIGJvb2wgR3JhcGhpY3NDb250ZXh0M0Q6OnJlc2hhcGVGQk9zKGNvbnMKIAogdm9p ZCBHcmFwaGljc0NvbnRleHQzRDo6cmVzb2x2ZU11bHRpc2FtcGxpbmdJZk5lY2Vzc2FyeShjb25z dCBJbnRSZWN0JiByZWN0KQogeworICAgIEdMYm9vbGVhbiBpc1NjaXNzb3JFbmFibGVkID0gOjpn bElzRW5hYmxlZChHTF9TQ0lTU09SX1RFU1QpOworICAgIDo6Z2xEaXNhYmxlKEdMX1NDSVNTT1Jf VEVTVCk7CisgICAgR0xib29sZWFuIGlzRGl0aGVyRW5hYmxlZCA9IDo6Z2xJc0VuYWJsZWQoR0xf RElUSEVSKTsKKyAgICA6OmdsRGlzYWJsZShHTF9ESVRIRVIpOworICAgIAogICAgIDo6Z2xCaW5k RnJhbWVidWZmZXJFWFQoR0xfUkVBRF9GUkFNRUJVRkZFUl9FWFQsIG1fbXVsdGlzYW1wbGVGQk8p OwogICAgIDo6Z2xCaW5kRnJhbWVidWZmZXJFWFQoR0xfRFJBV19GUkFNRUJVRkZFUl9FWFQsIG1f ZmJvKTsKIApAQCAtMTY5LDYgKzE3NCwxMSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZXNv bHZlTXVsdGlzYW1wCiAgICAgICAgIHJlc29sdmVSZWN0ID0gSW50UmVjdCgwLCAwLCBtX2N1cnJl bnRXaWR0aCwgbV9jdXJyZW50SGVpZ2h0KTsKIAogICAgIDo6Z2xCbGl0RnJhbWVidWZmZXJFWFQo cmVzb2x2ZVJlY3QueCgpLCByZXNvbHZlUmVjdC55KCksIHJlc29sdmVSZWN0Lm1heFgoKSwgcmVz b2x2ZVJlY3QubWF4WSgpLCByZXNvbHZlUmVjdC54KCksIHJlc29sdmVSZWN0LnkoKSwgcmVzb2x2 ZVJlY3QubWF4WCgpLCByZXNvbHZlUmVjdC5tYXhZKCksIEdMX0NPTE9SX0JVRkZFUl9CSVQsIEdM X0xJTkVBUik7CisKKyAgICBpZiAoaXNTY2lzc29yRW5hYmxlZCkKKyAgICAgICAgOjpnbEVuYWJs ZShHTF9TQ0lTU09SX1RFU1QpOworICAgIGlmIChpc0RpdGhlckVuYWJsZWQpCisgICAgICAgIDo6 Z2xFbmFibGUoR0xfRElUSEVSKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6cmVuZGVy YnVmZmVyU3RvcmFnZShHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIGludGVybmFsZm9ybWF0LCBH QzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQpCg==