235625 2022-01-25 18:55:26 -0800 [WebGPU] Build fix for Mac Catalyst 2022-01-25 20:24:37 -0800 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield webkit-bug-importer oldest_to_newest 1833966 0 mmaxfield 2022-01-25 18:55:26 -0800 The WGSL headers and .a file for Mac Catalyst need to not collide with the same files for regular Mac. 1833967 1 449989 mmaxfield 2022-01-25 18:57:39 -0800 Created attachment 449989 Patch 1833975 2 ews-feeder 2022-01-25 20:16:26 -0800 Committed r288603 (246422@main): <https://commits.webkit.org/246422@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449989. 1833977 3 webkit-bug-importer 2022-01-25 20:24:37 -0800 <rdar://problem/88058892> 449989 2022-01-25 18:57:39 -0800 2022-01-25 20:16:27 -0800 Patch patch.diff text/plain 2832 mmaxfield Y29tbWl0IDNkNDAxOTg2MGE2M2M3YmNiZTM2MDliM2ZmOTc2OTI1ZDA2YTZhZjQKQXV0aG9yOiBN eWxlcyBDLiBNYXhmaWVsZCA8bW1heGZpZWxkQGFwcGxlLmNvbT4KRGF0ZTogICBUdWUgSmFuIDI1 IDE4OjU2OjUzIDIwMjIgLTA4MDAKCiAgICBNYWMgQ2F0YWx5c3QgYnVpbGQgZml4CgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkdQVS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViR1BVL0NoYW5nZUxvZwpp bmRleCA4MDk3MGVhZjNlOGYuLmE1M2NjYjE3ZjEzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkdQ VS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkdQVS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBA QAorMjAyMi0wMS0yNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgor CisgICAgICAgIFtXZWJHUFVdIEJ1aWxkIGZpeCBmb3IgTWFjIENhdGFseXN0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU2MjUKKworICAgICAgICBV bnJldmlld2VkLgorCisgICAgICAgIFRoZSBXR1NMIGhlYWRlcnMgYW5kIC5hIGZpbGUgZm9yIE1h YyBDYXRhbHlzdCBuZWVkIHRvIG5vdCBjb2xsaWRlIHdpdGggdGhlIHNhbWUgZmlsZXMgZm9yIHJl Z3VsYXIgTWFjIGJ1aWxkcy4KKworICAgICAgICAqIENvbmZpZ3VyYXRpb25zL0Jhc2UueGNjb25m aWc6CisgICAgICAgICogQ29uZmlndXJhdGlvbnMvV0dTTC54Y2NvbmZpZzoKKwogMjAyMi0wMS0x OCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAg IFVzZSBjKysyYSBpbnN0ZWFkIG9mIGdudSsrMmEgZm9yIENvY29hIGJ1aWxkcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkdQVS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnIGIvU291cmNlL1dl YkdQVS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmlnCmluZGV4IDVhNjFiYzdjNzI3OS4uMmIz MGE2OTUyNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViR1BVL0NvbmZpZ3VyYXRpb25zL0Jhc2Uu eGNjb25maWcKKysrIGIvU291cmNlL1dlYkdQVS9Db25maWd1cmF0aW9ucy9CYXNlLnhjY29uZmln CkBAIC0xLDQgKzEsNCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDA5LTIwMjEgQXBwbGUgSW5jLiBB bGwgcmlnaHRzIHJlc2VydmVkLgorLy8gQ29weXJpZ2h0IChDKSAyMDA5LTIwMjIgQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8KIC8vIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogLy8gbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0xNjMsMyArMTYzLDcgQEAgV0tfVVNFUl9MVE9fTU9ERV8gPSAkKFdLX0RFRkFVTFRfTFRPX01P REUpOwogV0tfREVGQVVMVF9MVE9fTU9ERSA9ICQoV0tfVVNFUl9MVE9fTU9ERV90aGluKTsKIAog Tk9STUFMX1dFQkdQVV9GUkFNRVdPUktTX0RJUiA9ICQoU1lTVEVNX0xJQlJBUllfRElSKS9Qcml2 YXRlRnJhbWV3b3JrczsKKworV0dTTF9JTlNUQUxMX1BBVEhfUFJFRklYID0gJChXR1NMX0lOU1RB TExfUEFUSF9QUkVGSVhfREVQTE9ZTUVOVF8kKERFUExPWU1FTlRfTE9DQVRJT04pKTsKK1dHU0xf SU5TVEFMTF9QQVRIX1BSRUZJWF9ERVBMT1lNRU5UX1lFUyA9ICQoV0dTTF9JTlNUQUxMX1BBVEhf UFJFRklYX0RFUExPWU1FTlRfWUVTX1VTRV9BTFRFUk5BVEVfJChXS19VU0VfQUxURVJOQVRFX0ZS QU1FV09SS1NfRElSKSk7CitXR1NMX0lOU1RBTExfUEFUSF9QUkVGSVhfREVQTE9ZTUVOVF9ZRVNf VVNFX0FMVEVSTkFURV9ZRVMgPSAkKFdLX0FMVEVSTkFURV9GUkFNRVdPUktTX0RJUikvOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkdQVS9Db25maWd1cmF0aW9ucy9XR1NMLnhjY29uZmlnIGIvU291 cmNlL1dlYkdQVS9Db25maWd1cmF0aW9ucy9XR1NMLnhjY29uZmlnCmluZGV4IGRmOTAwZWM1MzFl OS4uYjY2NWZlMzBhZDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViR1BVL0NvbmZpZ3VyYXRpb25z L1dHU0wueGNjb25maWcKKysrIGIvU291cmNlL1dlYkdQVS9Db25maWd1cmF0aW9ucy9XR1NMLnhj Y29uZmlnCkBAIC0xLDQgKzEsNCBAQAotLy8gQ29weXJpZ2h0IChDKSAyMDE0LTIwMjEgQXBwbGUg SW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorLy8gQ29weXJpZ2h0IChDKSAyMDE0LTIwMjIgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogLy8KIC8vIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogLy8gbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCkBAIC0yMiw1ICsyMiw4IEBACiAvLyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBFWEVDVVRBQkxFX1BSRUZJ WCA9IGxpYjsKK0lOU1RBTExfUEFUSCA9ICQoV0dTTF9JTlNUQUxMX1BBVEhfUFJFRklYKS91c3Iv bG9jYWwvbGliOworUFJJVkFURV9IRUFERVJTX0ZPTERFUl9QQVRIID0gJChXR1NMX0lOU1RBTExf UEFUSF9QUkVGSVgpL3Vzci9sb2NhbC9pbmNsdWRlOworUFVCTElDX0hFQURFUlNfRk9MREVSX1BB VEggPSAkKFdHU0xfSU5TVEFMTF9QQVRIX1BSRUZJWCkvdXNyL2xvY2FsL2luY2x1ZGU7CiBIRUFE RVJfU0VBUkNIX1BBVEhTID0gIiQoQlVJTFRfUFJPRFVDVFNfRElSKS91c3IvbG9jYWwvaW5jbHVk ZSIgJChpbmhlcml0ZWQpOwogUFJPRFVDVF9OQU1FID0gd2dzbDsK