217978 2020-10-20 11:48:19 -0700 [WebGPU] Increase portability of GPUBindGroup 2020-10-20 15:21:33 -0700 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 don.olmstead don.olmstead changseok dino ews-watchlist graouts kondapallykalyan mmaxfield webkit-bug-importer oldest_to_newest 1699862 0 don.olmstead 2020-10-20 11:48:19 -0700 Remove more USE(METAL) 1699872 1 411897 don.olmstead 2020-10-20 12:13:37 -0700 Created attachment 411897 Patch 1699875 2 411897 mmaxfield 2020-10-20 12:28:43 -0700 Comment on attachment 411897 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411897&action=review > Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupAllocatorMetal.mm:-167 > -#endif // USE(METAL) This doesn't seem right. The file name ends in Metal and it's in a Cocoa folder. Presumably, if code needs to be shared, it should be moved to a more central place. 1699882 3 411897 don.olmstead 2020-10-20 12:40:28 -0700 Comment on attachment 411897 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=411897&action=review >> Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupAllocatorMetal.mm:-167 >> -#endif // USE(METAL) > > This doesn't seem right. The file name ends in Metal and it's in a Cocoa folder. Presumably, if code needs to be shared, it should be moved to a more central place. This is just moving the #endif to correspond to where it is in corresponding header. Those methods used to correspond to a USE(METAL) guard but now don't. I agree with you that the gpu/cocoa directory should be gpu/metal and any instances of USE(METAL) or PLATFORM(COCOA) should be removed from files contained there. I opened https://bugs.webkit.org/show_bug.cgi?id=217981 for that work. 1699917 4 mmaxfield 2020-10-20 14:11:23 -0700 (In reply to Don Olmstead from comment #3) > Comment on attachment 411897 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=411897&action=review > > >> Source/WebCore/platform/graphics/gpu/cocoa/GPUBindGroupAllocatorMetal.mm:-167 > >> -#endif // USE(METAL) > > > > This doesn't seem right. The file name ends in Metal and it's in a Cocoa folder. Presumably, if code needs to be shared, it should be moved to a more central place. > > This is just moving the #endif to correspond to where it is in corresponding > header. Those methods used to correspond to a USE(METAL) guard but now don't. > > I agree with you that the gpu/cocoa directory should be gpu/metal and any > instances of USE(METAL) or PLATFORM(COCOA) should be removed from files > contained there. I opened https://bugs.webkit.org/show_bug.cgi?id=217981 for > that work. I followed up with Don offline. The movement of the #endif wasn't to make that port build; it was just to match what was in the .h file for symmetry. 1699958 5 ews-feeder 2020-10-20 15:20:56 -0700 Committed r268766: <https://trac.webkit.org/changeset/268766> All reviewed patches have been landed. Closing bug and clearing flags on attachment 411897. 1699960 6 webkit-bug-importer 2020-10-20 15:21:33 -0700 <rdar://problem/70504009> 411897 2020-10-20 12:13:37 -0700 2020-10-20 15:20:56 -0700 Patch bug-217978.diff text/plain 5678 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMzM0M2JjODBjMGEuLjYwNDVkODUxMDE3MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIyIEBACisyMDIwLTEwLTIwICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29u eS5jb20+CisKKyAgICAgICAgW1dlYkdQVV0gSW5jcmVhc2UgcG9ydGFiaWxpdHkgb2YgR1BVQmlu ZEdyb3VwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTc5NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgbW9yZSB1c2VzIG9mIFVTRShNRVRBTCkgYXJvdW5kIHRoZSBHUFVCaW5kR3JvdXAgcmVs YXRlZCBjb25zdHJ1Y3RzIHRvIGluY3JlYXNlCisgICAgICAgIHBvcnRhYmlsaXR5LiBJbnRyb2R1 Y2UgYSBwbGF0Zm9ybSBzcGVjaWZpYyB0eXBlIGZvciBhbiBvZmZzZXQgaW50byB0aGUgR1BVIEJ1 ZmZlci4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVCaW5kR3JvdXAuaDoKKyAgICAgICAg KFdlYkNvcmU6OkdQVUJpbmRHcm91cDo6YXJndW1lbnRCdWZmZXIgY29uc3QpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVCaW5kR3JvdXBBbGxvY2F0b3IuaDoKKyAgICAgICAg KFdlYkNvcmU6OkdQVUJpbmRHcm91cEFsbG9jYXRvcjo6YXJndW1lbnRCdWZmZXIgY29uc3QpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9jb2NvYS9HUFVCaW5kR3JvdXBBbGxvY2F0 b3JNZXRhbC5tbToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvY29jb2EvR1BVUGxh dGZvcm1UeXBlc01ldGFsLmg6CisKIDIwMjAtMTAtMjAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9y bWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdIFJFR1JFU1NJT04ocjI2NjU1 OSk6IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvd2ViYXVkaW8vdGhlLWF1ZGlvLWFw aS90aGUtZGVzdGluYXRpb25ub2RlLWludGVyZmFjZS9kZXN0aW5hdGlvbi5odG1sIGlzIGZhaWxp bmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVC aW5kR3JvdXAuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVCaW5k R3JvdXAuaAppbmRleCAwOWFhYTUxMDEwZTAuLmIyOTJmMTM0NGI1NCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0dQVUJpbmRHcm91cC5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVCaW5kR3JvdXAuaApAQCAtNDAs OSArNDAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0cnVjdCBHUFVCaW5kR3JvdXBEZXNj cmlwdG9yOwogCi0jaWYgVVNFKE1FVEFMKQotdXNpbmcgQXJndW1lbnRCdWZmZXIgPSBzdGQ6OnBh aXI8Y29uc3QgTVRMQnVmZmVyICosIGNvbnN0IEdQVUJpbmRHcm91cEFsbG9jYXRvcjo6QXJndW1l bnRCdWZmZXJPZmZzZXRzJj47Ci0jZW5kaWYKK3VzaW5nIEFyZ3VtZW50QnVmZmVyID0gc3RkOjpw YWlyPGNvbnN0IFBsYXRmb3JtQnVmZmVyKiwgY29uc3QgR1BVQmluZEdyb3VwQWxsb2NhdG9yOjpB cmd1bWVudEJ1ZmZlck9mZnNldHMmPjsKIAogY2xhc3MgR1BVQmluZEdyb3VwIDogcHVibGljIFJl ZkNvdW50ZWQ8R1BVQmluZEdyb3VwPiB7CiBwdWJsaWM6CkBAIC01MCwxOSArNDgsMTUgQEAgcHVi bGljOgogCiAgICAgfkdQVUJpbmRHcm91cCgpOwogICAgIAotI2lmIFVTRShNRVRBTCkKICAgICBj b25zdCBBcmd1bWVudEJ1ZmZlciBhcmd1bWVudEJ1ZmZlcigpIGNvbnN0IHsgcmV0dXJuIHsgbV9h bGxvY2F0b3ItPmFyZ3VtZW50QnVmZmVyKCksIG1fYXJndW1lbnRCdWZmZXJPZmZzZXRzIH07IH0K LSNlbmRpZgogICAgIGNvbnN0IEhhc2hTZXQ8UmVmPEdQVUJ1ZmZlcj4+JiBib3VuZEJ1ZmZlcnMo KSBjb25zdCB7IHJldHVybiBtX2JvdW5kQnVmZmVyczsgfQogICAgIGNvbnN0IEhhc2hTZXQ8UmVm PEdQVVRleHR1cmU+PiYgYm91bmRUZXh0dXJlcygpIGNvbnN0IHsgcmV0dXJuIG1fYm91bmRUZXh0 dXJlczsgfQogCiBwcml2YXRlOgotI2lmIFVTRShNRVRBTCkKICAgICBHUFVCaW5kR3JvdXAoR1BV QmluZEdyb3VwQWxsb2NhdG9yOjpBcmd1bWVudEJ1ZmZlck9mZnNldHMmJiwgR1BVQmluZEdyb3Vw QWxsb2NhdG9yJiwgSGFzaFNldDxSZWY8R1BVQnVmZmVyPj4mJiwgSGFzaFNldDxSZWY8R1BVVGV4 dHVyZT4+JiYpOwogICAgIAogICAgIEdQVUJpbmRHcm91cEFsbG9jYXRvcjo6QXJndW1lbnRCdWZm ZXJPZmZzZXRzIG1fYXJndW1lbnRCdWZmZXJPZmZzZXRzOwogICAgIFJlZjxHUFVCaW5kR3JvdXBB bGxvY2F0b3I+IG1fYWxsb2NhdG9yOwotI2VuZGlmCiAgICAgSGFzaFNldDxSZWY8R1BVQnVmZmVy Pj4gbV9ib3VuZEJ1ZmZlcnM7CiAgICAgSGFzaFNldDxSZWY8R1BVVGV4dHVyZT4+IG1fYm91bmRU ZXh0dXJlczsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvR1BVQmluZEdyb3VwQWxsb2NhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvR1BVQmluZEdyb3VwQWxsb2NhdG9yLmgKaW5kZXggZWZkZmRlZjM1NDkwLi41 NmUwYWQ2MDkyMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dwdS9HUFVCaW5kR3JvdXBBbGxvY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ncHUvR1BVQmluZEdyb3VwQWxsb2NhdG9yLmgKQEAgLTQxLDI5ICs0MSwyNyBA QCBjbGFzcyBHUFVCaW5kR3JvdXBBbGxvY2F0b3IgOiBwdWJsaWMgUmVmQ291bnRlZDxHUFVCaW5k R3JvdXBBbGxvY2F0b3I+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPEdQVUJpbmRHcm91cEFs bG9jYXRvcj4gY3JlYXRlKEdQVUVycm9yU2NvcGVzJik7CiAKLSNpZiBVU0UoTUVUQUwpCiAgICAg c3RydWN0IEFyZ3VtZW50QnVmZmVyT2Zmc2V0cyB7Ci0gICAgICAgIE9wdGlvbmFsPE5TVUludGVn ZXI+IHZlcnRleDsKLSAgICAgICAgT3B0aW9uYWw8TlNVSW50ZWdlcj4gZnJhZ21lbnQ7Ci0gICAg ICAgIE9wdGlvbmFsPE5TVUludGVnZXI+IGNvbXB1dGU7CisgICAgICAgIE9wdGlvbmFsPFBsYXRm b3JtR1BVQnVmZmVyT2Zmc2V0PiB2ZXJ0ZXg7CisgICAgICAgIE9wdGlvbmFsPFBsYXRmb3JtR1BV QnVmZmVyT2Zmc2V0PiBmcmFnbWVudDsKKyAgICAgICAgT3B0aW9uYWw8UGxhdGZvcm1HUFVCdWZm ZXJPZmZzZXQ+IGNvbXB1dGU7CiAgICAgfTsKIAorI2lmIFVTRShNRVRBTCkKICAgICBPcHRpb25h bDxBcmd1bWVudEJ1ZmZlck9mZnNldHM+IGFsbG9jYXRlQW5kU2V0RW5jb2RlcnMoTVRMQXJndW1l bnRFbmNvZGVyICp2ZXJ0ZXgsIE1UTEFyZ3VtZW50RW5jb2RlciAqZnJhZ21lbnQsIE1UTEFyZ3Vt ZW50RW5jb2RlciAqY29tcHV0ZSk7CisjZW5kaWYKIAogICAgIHZvaWQgdHJ5UmVzZXQoKTsKIAot ICAgIGNvbnN0IE1UTEJ1ZmZlciAqYXJndW1lbnRCdWZmZXIoKSBjb25zdCB7IHJldHVybiBtX2Fy Z3VtZW50QnVmZmVyLmdldCgpOyB9Ci0jZW5kaWYKKyAgICBjb25zdCBQbGF0Zm9ybUJ1ZmZlciog YXJndW1lbnRCdWZmZXIoKSBjb25zdCB7IHJldHVybiBtX2FyZ3VtZW50QnVmZmVyLmdldCgpOyB9 CiAKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgR1BVQmluZEdyb3VwQWxsb2NhdG9yKEdQVUVycm9y U2NvcGVzJik7CiAKLSNpZiBVU0UoTUVUQUwpCi0gICAgYm9vbCByZWFsbG9jYXRlKE5TVUludGVn ZXIpOworICAgIGJvb2wgcmVhbGxvY2F0ZShQbGF0Zm9ybUdQVUJ1ZmZlck9mZnNldCk7CiAKLSAg ICBSZXRhaW5QdHI8TVRMQnVmZmVyPiBtX2FyZ3VtZW50QnVmZmVyOwotICAgIE5TVUludGVnZXIg bV9sYXN0T2Zmc2V0IHsgMCB9OwotI2VuZGlmCisgICAgUGxhdGZvcm1CdWZmZXJTbWFydFB0ciBt X2FyZ3VtZW50QnVmZmVyOworICAgIFBsYXRmb3JtR1BVQnVmZmVyT2Zmc2V0IG1fbGFzdE9mZnNl dCB7IDAgfTsKIAogICAgIFJlZjxHUFVFcnJvclNjb3Blcz4gbV9lcnJvclNjb3BlczsKICAgICBp bnQgbV9udW1CaW5kR3JvdXBzIHsgMCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVUJpbmRHcm91cEFsbG9jYXRvck1ldGFsLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVUJpbmRHcm91cEFs bG9jYXRvck1ldGFsLm1tCmluZGV4IDllYTRiOGQxYTU0Ni4uMWYxOGIyMjBiNTA4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvY29jb2EvR1BVQmluZEdy b3VwQWxsb2NhdG9yTWV0YWwubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3B1L2NvY29hL0dQVUJpbmRHcm91cEFsbG9jYXRvck1ldGFsLm1tCkBAIC0xMjEsNiArMTIx LDggQEAgT3B0aW9uYWw8R1BVQmluZEdyb3VwQWxsb2NhdG9yOjpBcmd1bWVudEJ1ZmZlck9mZnNl dHM+IEdQVUJpbmRHcm91cEFsbG9jYXRvcjo6YWwKICAgICByZXR1cm4gb2Zmc2V0czsKIH0KIAor I2VuZGlmIC8vIFVTRShNRVRBTCkKKwogLy8gRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDA2NTcsIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDA2NTggT3B0aW1pemUgcmVhbGxvY2F0aW9uIGFuZCByZXNldCBiZWhhdmlvci4K IGJvb2wgR1BVQmluZEdyb3VwQWxsb2NhdG9yOjpyZWFsbG9jYXRlKE5TVUludGVnZXIgbmV3T2Zm c2V0KQogewpAQCAtMTY0LDggKzE2Niw2IEBAIHZvaWQgR1BVQmluZEdyb3VwQWxsb2NhdG9yOjp0 cnlSZXNldCgpCiAgICAgfQogfQogCi0jZW5kaWYgLy8gVVNFKE1FVEFMKQotCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoV0VCR1BVKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVVBsYXRmb3JtVHlwZXNN ZXRhbC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVVBs YXRmb3JtVHlwZXNNZXRhbC5oCmluZGV4IDg2MDA3MjkyYWRjNC4uZTM5YWI1NDM1ODZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvY29jb2EvR1BVUGxh dGZvcm1UeXBlc01ldGFsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3B1L2NvY29hL0dQVVBsYXRmb3JtVHlwZXNNZXRhbC5oCkBAIC01MCw2ICs1MCw5IEBAIE9CSkNf UFJPVE9DT0woTVRMVGV4dHVyZSk7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAordXNpbmcgUGxh dGZvcm1HUFVCdWZmZXJPZmZzZXQgPSBOU1VJbnRlZ2VyOworCisvLyBNZXRhbCB0eXBlcwogdXNp bmcgUGxhdGZvcm1CdWZmZXIgPSBNVExCdWZmZXI7CiB1c2luZyBQbGF0Zm9ybUJ1ZmZlclNtYXJ0 UHRyID0gUmV0YWluUHRyPFBsYXRmb3JtQnVmZmVyPjsKIAo=