190452 2018-10-10 16:54:59 -0700 [WHSL -> MSL] Annotate semantics correctly in generated MSL 2018-10-10 18:10:44 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino commit-queue mmaxfield webkit-bug-importer oldest_to_newest 1467888 0 dino 2018-10-10 16:54:59 -0700 [WHSL -> MSL] Annotate semantics correctly in generated MSL 1467889 1 webkit-bug-importer 2018-10-10 16:55:21 -0700 <rdar://problem/45178272> 1467891 2 352000 dino 2018-10-10 16:58:12 -0700 Created attachment 352000 Patch 1467892 3 352000 mmaxfield 2018-10-10 17:02:34 -0700 Comment on attachment 352000 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352000&action=review > Tools/WebGPUShadingLanguageRI/Metal/MSLBackend.js:338 > if (structTypeAttributes.isVertexAttribute) > - annotations.push(`attribute(${index++})`); > - if (structTypeAttributes.isVertexOutputOrFragmentInput && fieldName === "wsl_Position") > + annotations.push(`attribute(${field._semantic._index})`); > + if (structTypeAttributes.isVertexOutputOrFragmentInput && field._semantic._name === "SV_Position") > annotations.push("position"); > - if (structTypeAttributes.isFragmentOutput && fieldName === "wsl_Color") > - annotations.push("color(0)"); > + if (structTypeAttributes.isFragmentOutput && field._semantic._name == "SV_Target") > + annotations.push(`color(${field._semantic._extraArguments[0]})`); Eventually we're going to need this to get much more complicated, but this is a good start. 1467903 4 dino 2018-10-10 18:10:44 -0700 Committed r237022: <https://trac.webkit.org/changeset/237022> 352000 2018-10-10 16:58:12 -0700 2018-10-10 17:03:32 -0700 Patch bug-190452-20181011105810.patch text/plain 3826 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2OTE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGUzZjE0N2UxNjUwOTI3NzQwY2FlYjg3MWQ2N2NiYzM5 NTc5OGVlZS4uM2JiYzI2MTExNjBiMmRlMDNhYzVjYzdhNGNlMzAyNzc3ZmFhMTk3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE4LTEwLTEwICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAg ICBbV0hTTCAtPiBNU0xdIEFubm90YXRlIHNlbWFudGljcyBjb3JyZWN0bHkgaW4gZ2VuZXJhdGVk IE1TTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkw NDUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NTE3ODI3Mj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3JyZWN0bHkgbGFiZWwgdGhlIGFwcHJv cHJpYXRlIHNlbWFudGljcyBhcyBbW3Bvc2l0aW9uXV0KKyAgICAgICAgYW5kIFtbY29sb3IoTild XS4KKworICAgICAgICAqIFdlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL01ldGFsL01TTEJhY2tlbmQu anM6IElkZW50aWZ5IHBvc2l0aW9uCisgICAgICAgIGFuZCBjb2xvciBhdHRyaWJ1dGVzLiBBbHNv IHVzZSB0aGUgc2VtYW50aWMncyBpbmRleCByYXRoZXIgdGhhbgorICAgICAgICBhIGNvdW50ZXIu CisgICAgICAgICogV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvTWV0YWwvV2hsc2xUb01zbC5odG1s OiBVc2UgYSA8cHJlPiBmb3IKKyAgICAgICAgb3V0cHV0LCBhbmQgb25seSBpbmNsdWRlIHRoZSBh Y3R1YWwgc2hhZGVyIGNvZGUuCisKIDIwMTgtMTAtMTAgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBw bGUuY29tPgogCiAgICAgICAgIEFkZCAtLXJhZGFyIG9wdGlvbiB0byB3ZWJraXQtcGF0Y2ggYnVn IGNyZWF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9NZXRh bC9NU0xCYWNrZW5kLmpzIGIvVG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvTWV0YWwvTVNM QmFja2VuZC5qcwppbmRleCAzNGI4MjUzMzc3ZjJlOTdjZGU4YTM2YzY3ZWEyMmI3M2NjZTYyOTYz Li5jMTk5M2FiOWM5ZDhlNmJjYzFlNTU5YWMwOTg3MWFlZmU4NWY2YWRiIDEwMDY0NAotLS0gYS9U b29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9NZXRhbC9NU0xCYWNrZW5kLmpzCisrKyBiL1Rv b2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL01ldGFsL01TTEJhY2tlbmQuanMKQEAgLTMyNSwx OCArMzI1LDE3IEBAIGNsYXNzIE1TTEJhY2tlbmQgewogICAgICAgICBjb25zdCBzdHJ1Y3RUeXBl QXR0cmlidXRlcyA9IHRoaXMuX2FsbFR5cGVBdHRyaWJ1dGVzLmF0dHJpYnV0ZXNGb3JUeXBlKHN0 cnVjdFR5cGUpOwogICAgICAgICBsZXQgc3JjID0gYHN0cnVjdCAke3RoaXMuX3R5cGVVbmlmaWVy LnVuaXF1ZVR5cGVJZChzdHJ1Y3RUeXBlKX0ge1xuYDsKIAotICAgICAgICBsZXQgaW5kZXggPSAw OwogICAgICAgICBmb3IgKGxldCBbZmllbGROYW1lLCBmaWVsZF0gb2Ygc3RydWN0VHlwZS5maWVs ZE1hcCkgewogICAgICAgICAgICAgY29uc3QgbWFuZ2xlZEZpZWxkTmFtZSA9IHN0cnVjdFR5cGVB dHRyaWJ1dGVzLm1hbmdsZWRGaWVsZE5hbWUoZmllbGROYW1lKTsKICAgICAgICAgICAgIHNyYyAr PSBgICAgICR7dGhpcy5fdHlwZVVuaWZpZXIudW5pcXVlVHlwZUlkKGZpZWxkLnR5cGUpfSAke21h bmdsZWRGaWVsZE5hbWV9YDsKIAogICAgICAgICAgICAgY29uc3QgYW5ub3RhdGlvbnMgPSBbXTsK ICAgICAgICAgICAgIGlmIChzdHJ1Y3RUeXBlQXR0cmlidXRlcy5pc1ZlcnRleEF0dHJpYnV0ZSkK LSAgICAgICAgICAgICAgICBhbm5vdGF0aW9ucy5wdXNoKGBhdHRyaWJ1dGUoJHtpbmRleCsrfSlg KTsKLSAgICAgICAgICAgIGlmIChzdHJ1Y3RUeXBlQXR0cmlidXRlcy5pc1ZlcnRleE91dHB1dE9y RnJhZ21lbnRJbnB1dCAmJiBmaWVsZE5hbWUgPT09ICJ3c2xfUG9zaXRpb24iKQorICAgICAgICAg ICAgICAgIGFubm90YXRpb25zLnB1c2goYGF0dHJpYnV0ZSgke2ZpZWxkLl9zZW1hbnRpYy5faW5k ZXh9KWApOworICAgICAgICAgICAgaWYgKHN0cnVjdFR5cGVBdHRyaWJ1dGVzLmlzVmVydGV4T3V0 cHV0T3JGcmFnbWVudElucHV0ICYmIGZpZWxkLl9zZW1hbnRpYy5fbmFtZSA9PT0gIlNWX1Bvc2l0 aW9uIikKICAgICAgICAgICAgICAgICBhbm5vdGF0aW9ucy5wdXNoKCJwb3NpdGlvbiIpOwotICAg ICAgICAgICAgaWYgKHN0cnVjdFR5cGVBdHRyaWJ1dGVzLmlzRnJhZ21lbnRPdXRwdXQgJiYgZmll bGROYW1lID09PSAid3NsX0NvbG9yIikKLSAgICAgICAgICAgICAgICBhbm5vdGF0aW9ucy5wdXNo KCJjb2xvcigwKSIpOworICAgICAgICAgICAgaWYgKHN0cnVjdFR5cGVBdHRyaWJ1dGVzLmlzRnJh Z21lbnRPdXRwdXQgJiYgZmllbGQuX3NlbWFudGljLl9uYW1lID09ICJTVl9UYXJnZXQiKQorICAg ICAgICAgICAgICAgIGFubm90YXRpb25zLnB1c2goYGNvbG9yKCR7ZmllbGQuX3NlbWFudGljLl9l eHRyYUFyZ3VtZW50c1swXX0pYCk7CiAgICAgICAgICAgICBpZiAoYW5ub3RhdGlvbnMubGVuZ3Ro KQogICAgICAgICAgICAgICAgIHNyYyArPSBgIFtbJHthbm5vdGF0aW9ucy5qb2luKCIsICIpfV1d YDsKICAgICAgICAgICAgIHNyYyArPSBgOyAvLyAke2ZpZWxkTmFtZX0gKCR7ZmllbGQudHlwZX0p IFxuYDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL01ldGFsL1do bHNsVG9Nc2wuaHRtbCBiL1Rvb2xzL1dlYkdQVVNoYWRpbmdMYW5ndWFnZVJJL01ldGFsL1dobHNs VG9Nc2wuaHRtbAppbmRleCA1OWY5M2Q3NTQ5MDc1NmQ1Zjg4NDY3NjhkNTYwZWI1NTAyZGNlMmUz Li43ZjEwMmU1MjY3OGU1NWE0YWY5MmYzNTU3MDZiZDQwZmVjZTUxOTM3IDEwMDY0NAotLS0gYS9U b29scy9XZWJHUFVTaGFkaW5nTGFuZ3VhZ2VSSS9NZXRhbC9XaGxzbFRvTXNsLmh0bWwKKysrIGIv VG9vbHMvV2ViR1BVU2hhZGluZ0xhbmd1YWdlUkkvTWV0YWwvV2hsc2xUb01zbC5odG1sCkBAIC0y NDAsNyArMjQwLDExIEBAIGZ1bmN0aW9uIGNvbXBpbGUoKSB7CiAgICAgbGV0IG91dHB1dCA9IGRv Y3VtZW50LnF1ZXJ5U2VsZWN0b3IoIiNvdXRwdXQiKTsKICAgICBvdXRwdXQudGV4dENvbnRlbnQg PSAiQ29tcGlsaW5nLi4uIjsKICAgICBsZXQgcmVzdWx0ID0gd2hsc2xUb01zbChzb3VyY2UpOwot ICAgIG91dHB1dC50ZXh0Q29udGVudCA9IEpTT04uc3RyaW5naWZ5KHJlc3VsdCk7CisgICAgaWYg KCFyZXN1bHQuX2Vycm9yKSB7CisgICAgICAgIG91dHB1dC50ZXh0Q29udGVudCA9IHJlc3VsdC5f bWV0YWxTaGFkZXJMYW5ndWFnZVNvdXJjZTsKKyAgICB9IGVsc2UgeworICAgICAgICBvdXRwdXQu dGV4dENvbnRlbnQgPSBgRXJyb3I6ICR7cmVzdWx0Ll9lcnJvci5vcmlnaW5TdHJpbmd9XG4ke3Jl c3VsdC5fZXJyb3Iuc3ludGF4RXJyb3JNZXNzYWdlfWA7CisgICAgfQogfQogCiB3aW5kb3cuYWRk RXZlbnRMaXN0ZW5lcigibG9hZCIsIGluaXQsIGZhbHNlKTsKQEAgLTI4NSw5ICsyODksOSBAQCBm cmFnbWVudCBGcmFnbWVudE91dHB1dCBmcmFnbWVudFNoYWRlcihGcmFnbWVudElucHV0IGZyYWdt ZW50SW5wdXQpIHsKICAgICByZXR1cm4gcmVzdWx0OwogfQogPC90ZXh0YXJlYT4KLTxkaXYgaWQ9 Im91dHB1dCI+Cis8cHJlIGlkPSJvdXRwdXQiPgogTm8gY29tcGlsZWQgb3V0cHV0LgotPC9kaXY+ Cis8L3ByZT4KIDxkaXYgaWQ9ImNvbnRyb2xzIj4KIDxidXR0b24+Q29tcGlsZTwvYnV0dG9uPgog PC9kaXY+Cg==