Skip to content

[WebGPU] nesting texture_external inside the AB causes alignment inconsistencies#36681

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
mwyrzykowski:eng/WebGPU-nesting-texture_external-inside-the-AB-causes-alignment-inconsistencies
Nov 15, 2024
Merged

[WebGPU] nesting texture_external inside the AB causes alignment inconsistencies#36681
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
mwyrzykowski:eng/WebGPU-nesting-texture_external-inside-the-AB-causes-alignment-inconsistencies

Conversation

@mwyrzykowski
Copy link
Copy Markdown
Contributor

@mwyrzykowski mwyrzykowski commented Nov 15, 2024

ddaea4e

[WebGPU] nesting texture_external inside the AB causes alignment inconsistencies
https://bugs.webkit.org/show_bug.cgi?id=283157
rdar://139735261

Reviewed by Tadeu Zagallo.

The shader struct and pipeline AB continued to be misaligned even
after 286594@main, so simply place the members in-line as that
is guaranteed to match the MTLArgumentEncoder result.

* LayoutTests/fast/webgpu/nocrash/fuzz-283157-expected.txt: Added.
* LayoutTests/fast/webgpu/nocrash/fuzz-283157.html: Added.
Add regression test.

* Source/WebGPU/WGSL/Metal/MetalFunctionWriter.cpp:
(WGSL::Metal::FunctionDefinitionWriter::emitNecessaryHelpers):
Revert 286594@main and insert members inline.

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

9c4d864

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-intel-wk2
✅ 🛠 tv
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@mwyrzykowski mwyrzykowski self-assigned this Nov 15, 2024
@mwyrzykowski mwyrzykowski added the WebGPU For bugs in WebGPU label Nov 15, 2024
@mwyrzykowski mwyrzykowski force-pushed the eng/WebGPU-nesting-texture_external-inside-the-AB-causes-alignment-inconsistencies branch from c169b32 to 9c4d864 Compare November 15, 2024 18:03
@mwyrzykowski mwyrzykowski added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Nov 15, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 15, 2024
@mwyrzykowski mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Nov 15, 2024
@webkit-ews-buildbot webkit-ews-buildbot added merge-queue Applied to send a pull request to merge-queue and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Nov 15, 2024
@webkit-ews-buildbot
Copy link
Copy Markdown
Collaborator

Safe-Merge-Queue: Build #38566.

…nsistencies

https://bugs.webkit.org/show_bug.cgi?id=283157
rdar://139735261

Reviewed by Tadeu Zagallo.

The shader struct and pipeline AB continued to be misaligned even
after 286594@main, so simply place the members in-line as that
is guaranteed to match the MTLArgumentEncoder result.

* LayoutTests/fast/webgpu/nocrash/fuzz-283157-expected.txt: Added.
* LayoutTests/fast/webgpu/nocrash/fuzz-283157.html: Added.
Add regression test.

* Source/WebGPU/WGSL/Metal/MetalFunctionWriter.cpp:
(WGSL::Metal::FunctionDefinitionWriter::emitNecessaryHelpers):
Revert 286594@main and insert members inline.

Canonical link: https://commits.webkit.org/286653@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WebGPU-nesting-texture_external-inside-the-AB-causes-alignment-inconsistencies branch from 9c4d864 to ddaea4e Compare November 15, 2024 21:31
@webkit-commit-queue
Copy link
Copy Markdown
Collaborator

Committed 286653@main (ddaea4e): https://commits.webkit.org/286653@main

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

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

Labels

WebGPU For bugs in WebGPU

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants