Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow WebGPU to compile non-WGSL source #6282

Merged
merged 1 commit into from Nov 15, 2022
Merged

Allow WebGPU to compile non-WGSL source #6282

merged 1 commit into from Nov 15, 2022

Conversation

mwyrzykowski
Copy link
Contributor

@mwyrzykowski mwyrzykowski commented Nov 9, 2022 •
edited by webkit-early-warning-system

e951de7

Allow WebGPU to compile non-WGSL source
https://bugs.webkit.org/show_bug.cgi?id=247657
<radar://102116179>

Reviewed by Myles C. Maxfield.

To facilitate testing, use the string passed to createShaderModule for
compiling the MTLLibrary if the WGSL compiler gives a zero length string.

* Source/WebGPU/WebGPU/ShaderModule.mm:
(WebGPU::earlyCompileShaderModule):
(WebGPU::Device::createShaderModule):

* Websites/webkit.org/demos/webgpu/scripts/hello-triangle.js:
(async helloTriangle):

Canonical link: https://commits.webkit.org/256707@main

56e0e0b

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe
✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 🧪 merge ✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

@mwyrzykowski mwyrzykowski force-pushed the eng/Allow-WebGPU-to-compile-non-WGSL-source branch from a45ca42 to 56e0e0b Compare November 9, 2022 04:47
@mwyrzykowski mwyrzykowski self-assigned this Nov 9, 2022
@mwyrzykowski mwyrzykowski added Other WebGPU For bugs in WebGPU labels Nov 9, 2022
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 56e0e0b)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe
✅ 🛠 ios-sim ✅ 🛠 mac-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🛠 mac-AS-debug ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 api-mac ✅ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk1
✅ 🛠 tv-sim ✅ 🧪 mac-wk2
✅ 🛠 🧪 merge ✅ 🛠 watch ✅ 🧪 mac-AS-debug-wk2
✅ 🛠 watch-sim ✅ 🧪 mac-wk2-stress

litherum
litherum approved these changes Nov 15, 2022
View reviewed changes
Copy link
Contributor

@litherum litherum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. As long as we can delete this as soon as possible

@mwyrzykowski mwyrzykowski added the merge-queue Applied to send a pull request to merge-queue label Nov 15, 2022
@mwyrzykowski
Allow WebGPU to compile non-WGSL source
e951de7 
https://bugs.webkit.org/show_bug.cgi?id=247657
<radar://102116179>

Reviewed by Myles C. Maxfield.

To facilitate testing, use the string passed to createShaderModule for
compiling the MTLLibrary if the WGSL compiler gives a zero length string.

* Source/WebGPU/WebGPU/ShaderModule.mm:
(WebGPU::earlyCompileShaderModule):
(WebGPU::Device::createShaderModule):

* Websites/webkit.org/demos/webgpu/scripts/hello-triangle.js:
(async helloTriangle):

Canonical link: https://commits.webkit.org/256707@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/Allow-WebGPU-to-compile-non-WGSL-source branch from 56e0e0b to e951de7 Compare November 15, 2022 20:33
@webkit-commit-queue
Copy link
Collaborator

Committed 256707@main (e951de7): https://commits.webkit.org/256707@main

Reviewed commits have been landed. Closing PR #6282 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system merged commit e951de7 into WebKit:main Nov 15, 2022
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@litherum litherum litherum approved these changes

@grorg grorg Awaiting requested review from grorg

@djg djg Awaiting requested review from djg

Assignees

@mwyrzykowski mwyrzykowski

Labels
WebGPU For bugs in WebGPU
Projects
None yet
Milestone
No milestone
4 participants
@mwyrzykowski @webkit-early-warning-system @webkit-commit-queue @litherum