166643 2017-01-02 15:58:32 -0800 [Cairo] Ensure depth and stencil renderbuffers are created on GLESv2 2017-03-21 04:01:20 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 emanuele.aina zan achristensen bugs-noreply cgarcia commit-queue dino graouts kondapallykalyan magomez mcatanzaro sam simon.fraser zan oldest_to_newest 1263362 0 emanuele.aina 2017-01-02 15:58:32 -0800 If the gfx device doesn't support GL_OES_packed_depth_stencil, the separate depth and stencil buffers are not generated. Copy what GraphicsContext3DEfl does and apply it in GraphicsContext3DCairo. The Intel gfx driver seem to tolerate unbound renderbuffers, but enabling debugging in Mesa yields an error: $ MESA_DEBUG=1 \ MESA_EXTENSION_OVERRIDE=-GL_OES_packed_depth_stencil ./bin/MiniBrowser http://webglsamples.org/aquarium/aquarium.html Mesa: User error: GL_INVALID_OPERATION in glRenderbufferStorage(no renderbuffer bound) 1263363 1 297917 emanuele.aina 2017-01-02 16:00:39 -0800 Created attachment 297917 Patch 1263380 2 297917 darin 2017-01-02 18:31:45 -0800 Comment on attachment 297917 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=297917&action=review > w/Source/WebCore/ChangeLog:3 > + Ensure depth and stencil renderbuffers are created on GLESv2 Bug should have [Cairo] in the subject since it’s a Cairo-specific patch and bug fix. > w/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp:91 > + , m_depthBuffer(0) > + , m_stencilBuffer(0) Should initialize these in the class definition rather than adding more conditionals to the .cpp file. 1264182 3 297917 achristensen 2017-01-05 12:04:15 -0800 Comment on attachment 297917 Patch Yep, we want more things like m_depthBuffer { nullptr }; in the header instead of in the cpp. 1289445 4 304919 zan 2017-03-20 01:12:26 -0700 Created attachment 304919 Patch for landing 1289446 5 zan 2017-03-20 01:17:18 -0700 Addressed the review comments. Sorry for taking this over, but I want to finally push it through into the source tree. 1289448 6 304919 commit-queue 2017-03-20 01:47:26 -0700 Comment on attachment 304919 Patch for landing Clearing flags on attachment: 304919 Committed r214162: <http://trac.webkit.org/changeset/214162> 1289449 7 commit-queue 2017-03-20 01:47:33 -0700 All reviewed patches have been landed. Closing bug. 1289752 8 emanuele.aina 2017-03-21 04:01:20 -0700 You're more than welcome to take over any patch from me. My time to work on WebKit is sadly spotty at best, so I really appreciate any help. Thanks Zan for landing this! :D 297917 2017-01-02 16:00:39 -0800 2017-03-20 01:12:12 -0700 Patch bug-166643-20170103005914.patch text/plain 4199 emanuele.aina U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwMjI1CmRpZmYgLS1naXQgYy9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgdy9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDU1NzZkNDQ4ODI0Mzc2 M2ZlYTE1ODFmOTczMGI4ZDBjYTY0ZjUxNS4uZTAzZGYzYzc1NmRkYWNlMTc2NTE1NzdjYjZiZWE1 NjhjNWRmZjg0MCAxMDA2NDQKLS0tIGMvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyB3L1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTAxLTAyICBFbWFu dWVsZSBBaW5hICA8ZW1hbnVlbGUuYWluYUBjb2xsYWJvcmEuY29tPgorCisgICAgICAgIEVuc3Vy ZSBkZXB0aCBhbmQgc3RlbmNpbCByZW5kZXJidWZmZXJzIGFyZSBjcmVhdGVkIG9uIEdMRVN2Mgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2NjQzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIGdm eCBkZXZpY2UgZG9lc24ndCBzdXBwb3J0IEdMX09FU19wYWNrZWRfZGVwdGhfc3RlbmNpbCwgdGhl CisgICAgICAgIHNlcGFyYXRlIGRlcHRoIGFuZCBzdGVuY2lsIGJ1ZmZlcnMgYXJlIG5vdCBnZW5l cmF0ZWQuCisKKyAgICAgICAgQ29weSB3aGF0IEdyYXBoaWNzQ29udGV4dDNERWZsIGRvZXMgYW5k IGFwcGx5IGl0IGluCisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uCisKKyAgICAgICAg VGhlIEludGVsIGdmeCBkcml2ZXIgc2VlbSB0byB0b2xlcmF0ZSB1bmJvdW5kIHJlbmRlcmJ1ZmZl cnMsIGJ1dAorICAgICAgICBlbmFibGluZyBkZWJ1Z2dpbmcgaW4gTWVzYSB5aWVsZHMgYW4gZXJy b3I6CisKKyAgICAgICAgJCBNRVNBX0RFQlVHPTEgXAorICAgICAgICAgIE1FU0FfRVhURU5TSU9O X09WRVJSSURFPS1HTF9PRVNfcGFja2VkX2RlcHRoX3N0ZW5jaWwKKyAgICAgICAgICAuL2Jpbi9N aW5pQnJvd3NlciBodHRwOi8vd2ViZ2xzYW1wbGVzLm9yZy9hcXVhcml1bS9hcXVhcml1bS5odG1s CisgICAgICAgIE1lc2E6IFVzZXIgZXJyb3I6IEdMX0lOVkFMSURfT1BFUkFUSU9OIGluIGdsUmVu ZGVyYnVmZmVyU3RvcmFnZShubyByZW5kZXJidWZmZXIgYm91bmQpCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJvLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRCk6CisgICAgICAg IEVuc3VyZSBzZXBhcmF0ZSBkZXB0aCBhbmQgc3RlbmNpbCByZW5kZXJidWZmZXJzIGFyZSBjcmVh dGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6On5HcmFwaGljc0NvbnRl eHQzRCk6CisgICAgICAgIEVuc3VyZSBzZXBhcmF0ZSBkZXB0aCBhbmQgc3RlbmNpbCByZW5kZXJi dWZmZXJzIGFyZSByZWxlYXNlZC4KKworCiAyMDE3LTAxLTAyICBBbmRyZWFzIEtsaW5nICA8YWts aW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBEaXNjYXJkIG1lZGlhIGNvbnRyb2xzIEpTL0NTUyBj YWNoZXMgdW5kZXIgbWVtb3J5IHByZXNzdXJlLgpkaWZmIC0tZ2l0IGMvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHAgdy9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJv LmNwcAppbmRleCBiOWY5M2FmNzBkOWM1Yjg5Mjg3MTA3OTgzYjA2ODcyYzQ2ZDdlMTc2Li5iM2Qw Mzc0ZWE5MmNjZmE3YzAyNGNmOGVhZGFiMTI4NTJmN2UxOGUxIDEwMDY0NAotLS0gYy9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHQzRENhaXJvLmNw cAorKysgdy9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0Nv bnRleHQzRENhaXJvLmNwcApAQCAtODYsNiArODYsMTAgQEAgR3JhcGhpY3NDb250ZXh0M0Q6Okdy YXBoaWNzQ29udGV4dDNEKEdyYXBoaWNzQ29udGV4dDNEQXR0cmlidXRlcyBhdHRyaWJ1dGVzLCBI b3MKICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1NfVEhSRUFERUQpCiAgICAgLCBtX2ludGVy bWVkaWF0ZVRleHR1cmUoMCkKICNlbmRpZgorI2lmIFVTRShPUEVOR0xfRVNfMikKKyAgICAsIG1f ZGVwdGhCdWZmZXIoMCkKKyAgICAsIG1fc3RlbmNpbEJ1ZmZlcigwKQorI2VuZGlmCiAgICAgLCBt X2RlcHRoU3RlbmNpbEJ1ZmZlcigwKQogICAgICwgbV9sYXllckNvbXBvc2l0ZWQoZmFsc2UpCiAg ICAgLCBtX211bHRpc2FtcGxlRkJPKDApCkBAIC0xMjksOSArMTMzLDYgQEAgR3JhcGhpY3NDb250 ZXh0M0Q6OkdyYXBoaWNzQ29udGV4dDNEKEdyYXBoaWNzQ29udGV4dDNEQXR0cmlidXRlcyBhdHRy aWJ1dGVzLCBIb3MKICAgICAgICAgOjpnbEJpbmRUZXh0dXJlKEdMX1RFWFRVUkVfMkQsIDApOwog I2VuZGlmCiAKLSAgICAgICAgbV9zdGF0ZS5ib3VuZEZCTyA9IG1fZmJvOwotICAgICAgICBpZiAo IW1fYXR0cnMuYW50aWFsaWFzICYmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkp Ci0gICAgICAgICAgICA6OmdsR2VuUmVuZGVyYnVmZmVycygxLCAmbV9kZXB0aFN0ZW5jaWxCdWZm ZXIpOwogCiAgICAgICAgIC8vIENyZWF0ZSBhIG11bHRpc2FtcGxlIEZCTy4KICAgICAgICAgaWYg KG1fYXR0cnMuYW50aWFsaWFzKSB7CkBAIC0xNDEsNiArMTQyLDE4IEBAIEdyYXBoaWNzQ29udGV4 dDNEOjpHcmFwaGljc0NvbnRleHQzRChHcmFwaGljc0NvbnRleHQzREF0dHJpYnV0ZXMgYXR0cmli dXRlcywgSG9zCiAgICAgICAgICAgICA6OmdsR2VuUmVuZGVyYnVmZmVycygxLCAmbV9tdWx0aXNh bXBsZUNvbG9yQnVmZmVyKTsKICAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9h dHRycy5kZXB0aCkKICAgICAgICAgICAgICAgICA6OmdsR2VuUmVuZGVyYnVmZmVycygxLCAmbV9t dWx0aXNhbXBsZURlcHRoU3RlbmNpbEJ1ZmZlcik7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICAvLyBCaW5kIGNhbnZhcyBGQk8uCisgICAgICAgICAgICBnbEJpbmRGcmFtZWJ1ZmZlcihH cmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fZmJvKTsKKyAgICAgICAgICAgIG1fc3Rh dGUuYm91bmRGQk8gPSBtX2ZibzsKKyNpZiBVU0UoT1BFTkdMX0VTXzIpCisgICAgICAgICAgICBp ZiAobV9hdHRycy5kZXB0aCkKKyAgICAgICAgICAgICAgICBnbEdlblJlbmRlcmJ1ZmZlcnMoMSwg Jm1fZGVwdGhCdWZmZXIpOworICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCkKKyAgICAg ICAgICAgICAgICBnbEdlblJlbmRlcmJ1ZmZlcnMoMSwgJm1fc3RlbmNpbEJ1ZmZlcik7CisjZW5k aWYKKyAgICAgICAgICAgIGlmIChtX2F0dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkKKyAg ICAgICAgICAgICAgICBnbEdlblJlbmRlcmJ1ZmZlcnMoMSwgJm1fZGVwdGhTdGVuY2lsQnVmZmVy KTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMjEyLDggKzIyNSwxNSBAQCBHcmFwaGljc0NvbnRl eHQzRDo6fkdyYXBoaWNzQ29udGV4dDNEKCkKICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8 fCBtX2F0dHJzLmRlcHRoKQogICAgICAgICAgICAgOjpnbERlbGV0ZVJlbmRlcmJ1ZmZlcnMoMSwg Jm1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5jaWxCdWZmZXIpOwogICAgICAgICA6OmdsRGVsZXRlRnJh bWVidWZmZXJzKDEsICZtX211bHRpc2FtcGxlRkJPKTsKLSAgICB9IGVsc2UgewotICAgICAgICBp ZiAobV9hdHRycy5zdGVuY2lsIHx8IG1fYXR0cnMuZGVwdGgpCisgICAgfSBlbHNlIGlmIChtX2F0 dHJzLnN0ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkgeworI2lmIFVTRShPUEVOR0xfRVNfMikKKyAg ICAgICAgaWYgKG1fZGVwdGhCdWZmZXIpCisgICAgICAgICAgICBnbERlbGV0ZVJlbmRlcmJ1ZmZl cnMoMSwgJm1fZGVwdGhCdWZmZXIpOworCisgICAgICAgIGlmIChtX3N0ZW5jaWxCdWZmZXIpCisg ICAgICAgICAgICBnbERlbGV0ZVJlbmRlcmJ1ZmZlcnMoMSwgJm1fc3RlbmNpbEJ1ZmZlcik7Cisj ZW5kaWYKKyAgICAgICAgaWYgKG1fZGVwdGhTdGVuY2lsQnVmZmVyKQogICAgICAgICAgICAgOjpn bERlbGV0ZVJlbmRlcmJ1ZmZlcnMoMSwgJm1fZGVwdGhTdGVuY2lsQnVmZmVyKTsKICAgICB9CiAg ICAgOjpnbERlbGV0ZUZyYW1lYnVmZmVycygxLCAmbV9mYm8pOwo= 304919 2017-03-20 01:12:26 -0700 2017-03-20 01:47:26 -0700 Patch for landing bug-166643-20170320091224.patch text/plain 4870 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc2MDFmM2I3YWMzZGVh NTljOGQwMjk2ZWZkZWUzODFmZmE4YjYyZi4uOTNjZThjZTk2OTVhOGJmZTMwNDdkMjM4YTNhOWU3 MzkwZGJkZjA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTAzLTIwICBFbWFu dWVsZSBBaW5hICA8ZW1hbnVlbGUuYWluYUBjb2xsYWJvcmEuY29tPgorCisgICAgICAgIFtDYWly b10gRW5zdXJlIGRlcHRoIGFuZCBzdGVuY2lsIHJlbmRlcmJ1ZmZlcnMgYXJlIGNyZWF0ZWQgb24g R0xFU3YyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NjY2NDMKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBJZiB0 aGUgZ2Z4IGRldmljZSBkb2Vzbid0IHN1cHBvcnQgR0xfT0VTX3BhY2tlZF9kZXB0aF9zdGVuY2ls LCB0aGUKKyAgICAgICAgc2VwYXJhdGUgZGVwdGggYW5kIHN0ZW5jaWwgYnVmZmVycyBhcmUgbm90 IGdlbmVyYXRlZC4KKworICAgICAgICBDb3B5IHdoYXQgR3JhcGhpY3NDb250ZXh0M0RFZmwgdXNl ZCB0byBkbyBhbmQgYXBwbHkgaXQgaW4KKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0RDYWlyby4K KworICAgICAgICBUaGUgSW50ZWwgZ2Z4IGRyaXZlciBzZWVtIHRvIHRvbGVyYXRlIHVuYm91bmQg cmVuZGVyYnVmZmVycywgYnV0CisgICAgICAgIGVuYWJsaW5nIGRlYnVnZ2luZyBpbiBNZXNhIHlp ZWxkcyBhbiBlcnJvcjoKKworICAgICAgICAkIE1FU0FfREVCVUc9MSBcCisgICAgICAgICAgTUVT QV9FWFRFTlNJT05fT1ZFUlJJREU9LUdMX09FU19wYWNrZWRfZGVwdGhfc3RlbmNpbAorICAgICAg ICAgIC4vYmluL01pbmlCcm93c2VyIGh0dHA6Ly93ZWJnbHNhbXBsZXMub3JnL2FxdWFyaXVtL2Fx dWFyaXVtLmh0bWwKKyAgICAgICAgTWVzYTogVXNlciBlcnJvcjogR0xfSU5WQUxJRF9PUEVSQVRJ T04gaW4gZ2xSZW5kZXJidWZmZXJTdG9yYWdlKG5vIHJlbmRlcmJ1ZmZlciBib3VuZCkKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmg6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0M0RDYWlyby5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhpY3NDb250ZXh0M0QpOgorICAg ICAgICBFbnN1cmUgc2VwYXJhdGUgZGVwdGggYW5kIHN0ZW5jaWwgcmVuZGVyYnVmZmVycyBhcmUg Y3JlYXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDNEOjp+R3JhcGhpY3ND b250ZXh0M0QpOgorICAgICAgICBFbnN1cmUgc2VwYXJhdGUgZGVwdGggYW5kIHN0ZW5jaWwgcmVu ZGVyYnVmZmVycyBhcmUgcmVsZWFzZWQuCisKIDIwMTctMDMtMTkgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBJbXBsZW1lbnQgc2VsZi5vcmlnaW4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRC5oCmlu ZGV4IDBkZmU5MzVmMjJlMjBhMjBlOGE3MmNkNDg5MTZmZjQ2MDhjYTEwYTkuLjdkODBkNWI0NWI0 NTg1ZGIzNDJkZWYyYjcxZGYyMmQ2Zjc5NWIzYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dDNELmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0M0QuaApAQCAtMTM5NCw5ICsxMzk0 LDkgQEAgcHJpdmF0ZToKICAgICBHQzNEdWludCBtX2ludGVybWVkaWF0ZVRleHR1cmU7CiAjZW5k aWYKIAotICAgIEdDM0R1aW50IG1fZGVwdGhCdWZmZXI7Ci0gICAgR0MzRHVpbnQgbV9zdGVuY2ls QnVmZmVyOwotICAgIEdDM0R1aW50IG1fZGVwdGhTdGVuY2lsQnVmZmVyOworICAgIEdDM0R1aW50 IG1fZGVwdGhCdWZmZXIgeyAwIH07CisgICAgR0MzRHVpbnQgbV9zdGVuY2lsQnVmZmVyIHsgMCB9 OworICAgIEdDM0R1aW50IG1fZGVwdGhTdGVuY2lsQnVmZmVyIHsgMCB9OwogCiAgICAgYm9vbCBt X2xheWVyQ29tcG9zaXRlZDsKICAgICBHQzNEdWludCBtX2ludGVybmFsQ29sb3JGb3JtYXQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGlj c0NvbnRleHQzRENhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nh aXJvL0dyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uY3BwCmluZGV4IGY0ODY0MGEyM2E4OGI2Zjc0N2Zm MDQ1NmZhNmQ1NWJlYmM4MDQwZDUuLmI0YWU3OWU0YWFjMzJmM2RjMjJhZDlhNGVhMWFmN2M1Mzk1 MmQxZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dDNEQ2Fpcm8uY3BwCkBAIC05MCw3ICs5MCw2 IEBAIEdyYXBoaWNzQ29udGV4dDNEOjpHcmFwaGljc0NvbnRleHQzRChHcmFwaGljc0NvbnRleHQz REF0dHJpYnV0ZXMgYXR0cmlidXRlcywgSG9zCiAjaWYgVVNFKENPT1JESU5BVEVEX0dSQVBISUNT X1RIUkVBREVEKQogICAgICwgbV9pbnRlcm1lZGlhdGVUZXh0dXJlKDApCiAjZW5kaWYKLSAgICAs IG1fZGVwdGhTdGVuY2lsQnVmZmVyKDApCiAgICAgLCBtX2xheWVyQ29tcG9zaXRlZChmYWxzZSkK ICAgICAsIG1fbXVsdGlzYW1wbGVGQk8oMCkKICAgICAsIG1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5j aWxCdWZmZXIoMCkKQEAgLTEzOCw5ICsxMzcsNiBAQCBHcmFwaGljc0NvbnRleHQzRDo6R3JhcGhp Y3NDb250ZXh0M0QoR3JhcGhpY3NDb250ZXh0M0RBdHRyaWJ1dGVzIGF0dHJpYnV0ZXMsIEhvcwog ICAgICAgICA6OmdsQmluZFRleHR1cmUoR0xfVEVYVFVSRV8yRCwgMCk7CiAjZW5kaWYKIAotICAg ICAgICBtX3N0YXRlLmJvdW5kRkJPID0gbV9mYm87Ci0gICAgICAgIGlmICghbV9hdHRycy5hbnRp YWxpYXMgJiYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0dHJzLmRlcHRoKSkKLSAgICAgICAgICAg IDo6Z2xHZW5SZW5kZXJidWZmZXJzKDEsICZtX2RlcHRoU3RlbmNpbEJ1ZmZlcik7CiAKICAgICAg ICAgLy8gQ3JlYXRlIGEgbXVsdGlzYW1wbGUgRkJPLgogICAgICAgICBpZiAobV9hdHRycy5hbnRp YWxpYXMpIHsKQEAgLTE1MCw2ICsxNDYsMTggQEAgR3JhcGhpY3NDb250ZXh0M0Q6OkdyYXBoaWNz Q29udGV4dDNEKEdyYXBoaWNzQ29udGV4dDNEQXR0cmlidXRlcyBhdHRyaWJ1dGVzLCBIb3MKICAg ICAgICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJzKDEsICZtX211bHRpc2FtcGxlQ29sb3JCdWZm ZXIpOwogICAgICAgICAgICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0dHJzLmRlcHRoKQog ICAgICAgICAgICAgICAgIDo6Z2xHZW5SZW5kZXJidWZmZXJzKDEsICZtX211bHRpc2FtcGxlRGVw dGhTdGVuY2lsQnVmZmVyKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIC8vIEJpbmQg Y2FudmFzIEZCTy4KKyAgICAgICAgICAgIGdsQmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUiwgbV9mYm8pOworICAgICAgICAgICAgbV9zdGF0ZS5ib3VuZEZCTyA9 IG1fZmJvOworI2lmIFVTRShPUEVOR0xfRVNfMikKKyAgICAgICAgICAgIGlmIChtX2F0dHJzLmRl cHRoKQorICAgICAgICAgICAgICAgIGdsR2VuUmVuZGVyYnVmZmVycygxLCAmbV9kZXB0aEJ1ZmZl cik7CisgICAgICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsKQorICAgICAgICAgICAgICAgIGds R2VuUmVuZGVyYnVmZmVycygxLCAmbV9zdGVuY2lsQnVmZmVyKTsKKyNlbmRpZgorICAgICAgICAg ICAgaWYgKG1fYXR0cnMuc3RlbmNpbCB8fCBtX2F0dHJzLmRlcHRoKQorICAgICAgICAgICAgICAg IGdsR2VuUmVuZGVyYnVmZmVycygxLCAmbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogICAgICAgICB9 CiAgICAgfQogCkBAIC0yMjgsOCArMjM2LDE1IEBAIEdyYXBoaWNzQ29udGV4dDNEOjp+R3JhcGhp Y3NDb250ZXh0M0QoKQogICAgICAgICBpZiAobV9hdHRycy5zdGVuY2lsIHx8IG1fYXR0cnMuZGVw dGgpCiAgICAgICAgICAgICA6OmdsRGVsZXRlUmVuZGVyYnVmZmVycygxLCAmbV9tdWx0aXNhbXBs ZURlcHRoU3RlbmNpbEJ1ZmZlcik7CiAgICAgICAgIDo6Z2xEZWxldGVGcmFtZWJ1ZmZlcnMoMSwg Jm1fbXVsdGlzYW1wbGVGQk8pOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChtX2F0dHJzLnN0 ZW5jaWwgfHwgbV9hdHRycy5kZXB0aCkKKyAgICB9IGVsc2UgaWYgKG1fYXR0cnMuc3RlbmNpbCB8 fCBtX2F0dHJzLmRlcHRoKSB7CisjaWYgVVNFKE9QRU5HTF9FU18yKQorICAgICAgICBpZiAobV9k ZXB0aEJ1ZmZlcikKKyAgICAgICAgICAgIGdsRGVsZXRlUmVuZGVyYnVmZmVycygxLCAmbV9kZXB0 aEJ1ZmZlcik7CisKKyAgICAgICAgaWYgKG1fc3RlbmNpbEJ1ZmZlcikKKyAgICAgICAgICAgIGds RGVsZXRlUmVuZGVyYnVmZmVycygxLCAmbV9zdGVuY2lsQnVmZmVyKTsKKyNlbmRpZgorICAgICAg ICBpZiAobV9kZXB0aFN0ZW5jaWxCdWZmZXIpCiAgICAgICAgICAgICA6OmdsRGVsZXRlUmVuZGVy YnVmZmVycygxLCAmbV9kZXB0aFN0ZW5jaWxCdWZmZXIpOwogICAgIH0KICAgICA6OmdsRGVsZXRl RnJhbWVidWZmZXJzKDEsICZtX2Zibyk7Cg==