GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly #48376

mwyrzykowski · 2025-07-22T17:42:50Z

`ed52872`

GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly
https://bugs.webkit.org/show_bug.cgi?id=296062
rdar://155971582

Reviewed by Tadeu Zagallo.

Auto-generated layouts can not be used interchangably, rather they
are fixed to a specific bind group layout and therefore bind group.

Prevent different auto-generated layouts from being intermixed, even
when their entries are otherwise identical.

This would previously always fail validation layer and is currently
preventing the drop down box on https://webgpu.github.io/webgpu-samples/?sample=videoUploading
from functioning.

* LayoutTests/fast/webgpu/regression/repro_296062-expected.txt: Added.
* LayoutTests/fast/webgpu/regression/repro_296062.html: Added.
Add regression test.

* Source/WebCore/Modules/WebGPU/GPUBindGroup.cpp:
(WebCore::GPUBindGroup::GPUBindGroup):
* Source/WebCore/Modules/WebGPU/GPUBindGroup.h:
(WebCore::GPUBindGroup::create):
(WebCore::GPUBindGroup::autogeneratedPipelineLayout const):
(WebCore::GPUBindGroup::GPUBindGroup): Deleted.
* Source/WebCore/Modules/WebGPU/GPUBindGroupLayout.h:
(WebCore::GPUBindGroupLayout::create):
(WebCore::GPUBindGroupLayout::autogeneratedPipelineLayout const):
(WebCore::GPUBindGroupLayout::GPUBindGroupLayout):
* Source/WebCore/Modules/WebGPU/GPUComputePipeline.cpp:
(WebCore::GPUComputePipeline::getBindGroupLayout):
* Source/WebCore/Modules/WebGPU/GPUComputePipeline.h:
(WebCore::GPUComputePipeline::create):
(WebCore::GPUComputePipeline::GPUComputePipeline):
* Source/WebCore/Modules/WebGPU/GPUDevice.cpp:
* Source/WebCore/Modules/WebGPU/GPUPipelineDescriptorBase.h:
(WebCore::nextUniqueAutogeneratedPipelineIdentifier):
(WebCore::GPUPipelineDescriptorBase::uniqueAutogeneratedId const):
* Source/WebCore/Modules/WebGPU/GPURenderPipeline.cpp:
(WebCore::GPURenderPipeline::getBindGroupLayout):
* Source/WebCore/Modules/WebGPU/GPURenderPipeline.h:
(WebCore::GPURenderPipeline::create):
(WebCore::GPURenderPipeline::GPURenderPipeline):
Ensure auto-generated layouts don't allow mismatches.

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

f34ad83

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 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	~~🛠 playstation~~
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-07-22T17:42:57Z

EWS run on previous version of this PR (hash 88f7452)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	❌ 🛠 wpe	~~🛠 win~~
✅ 🧪 bindings	✅ 🛠 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
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	~~🛠 playstation~~
	✅ 🛠 tv	~~🛠 mac-safer-cpp~~
	~~🛠 tv-sim~~
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2025-07-22T18:08:54Z

EWS run on previous version of this PR (hash b7a170d)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 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
🧪 services	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🧪 api-gtk
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	❌ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-ews-buildbot · 2025-07-22T20:06:51Z

Safer C++ Build #45187 (`b7a170d`)

❌ Found 1 failing file with 1 issue. Please address these issues before landing. See WebKit Guidelines for Safer C++ Programming.
(cc @rniwa)

webkit-early-warning-system · 2025-07-22T20:30:51Z

EWS run on previous version of this PR (hash 9f07cb1)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 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~~
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2	✅ 🛠 playstation
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

tadeuzagallo · 2025-07-22T20:46:01Z

Source/WebCore/Modules/WebGPU/GPUBindGroup.h

    WebGPU::BindGroup& backing() { return m_backing; }
    const WebGPU::BindGroup& backing() const { return m_backing; }
    bool updateExternalTextures(GPUExternalTexture&);
+    uint64_t autogeneratedPipelineLayout() const { return m_autogeneratedPipelineLayout; }


Just a nit, but I find the name a bit confusing, since I'd expect this to return an actual layout object. If I understood correctly, isn't this a unique identifier for the pipeline?

oh yes, let me update that name

webkit-early-warning-system · 2025-07-22T21:43:02Z

EWS run on previous version of this PR (hash 32af205)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	❌ 🛠 ios	❌ 🛠 mac	❌ 🛠 wpe	❌ 🛠 win
✅ 🧪 bindings	❌ 🛠 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
	⏳ 🧪 vision-wk2	❌ 🧪 mac-intel-wk2	❌ 🛠 playstation
	❌ 🛠 tv	❌ 🛠 mac-safer-cpp
	❌ 🛠 tv-sim
	❌ 🛠 watch
	❌ 🛠 watch-sim

djg · 2025-07-23T01:04:02Z

Source/WebCore/Modules/WebGPU/GPUComputePipeline.cpp


 Ref<GPUBindGroupLayout> GPUComputePipeline::getBindGroupLayout(uint32_t index)
 {
    // "A new GPUBindGroupLayout wrapper is returned each time"


Is this comment a TODO/FIXME? Or documenting the spec?

Documenting the spec

webkit-early-warning-system · 2025-07-23T02:52:17Z

EWS run on current version of this PR (hash f34ad83)

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win
✅ 🧪 bindings	✅ 🛠 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	~~🛠 playstation~~
	✅ 🛠 tv	✅ 🛠 mac-safer-cpp
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

…ctly https://bugs.webkit.org/show_bug.cgi?id=296062 rdar://155971582 Reviewed by Tadeu Zagallo. Auto-generated layouts can not be used interchangably, rather they are fixed to a specific bind group layout and therefore bind group. Prevent different auto-generated layouts from being intermixed, even when their entries are otherwise identical. This would previously always fail validation layer and is currently preventing the drop down box on https://webgpu.github.io/webgpu-samples/?sample=videoUploading from functioning. * LayoutTests/fast/webgpu/regression/repro_296062-expected.txt: Added. * LayoutTests/fast/webgpu/regression/repro_296062.html: Added. Add regression test. * Source/WebCore/Modules/WebGPU/GPUBindGroup.cpp: (WebCore::GPUBindGroup::GPUBindGroup): * Source/WebCore/Modules/WebGPU/GPUBindGroup.h: (WebCore::GPUBindGroup::create): (WebCore::GPUBindGroup::autogeneratedPipelineLayout const): (WebCore::GPUBindGroup::GPUBindGroup): Deleted. * Source/WebCore/Modules/WebGPU/GPUBindGroupLayout.h: (WebCore::GPUBindGroupLayout::create): (WebCore::GPUBindGroupLayout::autogeneratedPipelineLayout const): (WebCore::GPUBindGroupLayout::GPUBindGroupLayout): * Source/WebCore/Modules/WebGPU/GPUComputePipeline.cpp: (WebCore::GPUComputePipeline::getBindGroupLayout): * Source/WebCore/Modules/WebGPU/GPUComputePipeline.h: (WebCore::GPUComputePipeline::create): (WebCore::GPUComputePipeline::GPUComputePipeline): * Source/WebCore/Modules/WebGPU/GPUDevice.cpp: * Source/WebCore/Modules/WebGPU/GPUPipelineDescriptorBase.h: (WebCore::nextUniqueAutogeneratedPipelineIdentifier): (WebCore::GPUPipelineDescriptorBase::uniqueAutogeneratedId const): * Source/WebCore/Modules/WebGPU/GPURenderPipeline.cpp: (WebCore::GPURenderPipeline::getBindGroupLayout): * Source/WebCore/Modules/WebGPU/GPURenderPipeline.h: (WebCore::GPURenderPipeline::create): (WebCore::GPURenderPipeline::GPURenderPipeline): Ensure auto-generated layouts don't allow mismatches. Canonical link: https://commits.webkit.org/297771@main

webkit-commit-queue · 2025-07-23T04:58:39Z

Committed 297771@main (ed52872): https://commits.webkit.org/297771@main

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

mwyrzykowski self-assigned this Jul 22, 2025

mwyrzykowski added the WebGPU For bugs in WebGPU label Jul 22, 2025

mwyrzykowski requested review from djg and tadeuzagallo July 22, 2025 17:45

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 22, 2025

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Jul 22, 2025

mwyrzykowski changed the title ~~https://bugs.webkit.org/show_bug.cgi?id=296062~~ GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly Jul 22, 2025

mwyrzykowski force-pushed the eng/155971582 branch from 88f7452 to b7a170d Compare July 22, 2025 18:08

mwyrzykowski force-pushed the eng/155971582 branch from b7a170d to 9f07cb1 Compare July 22, 2025 20:30

tadeuzagallo approved these changes Jul 22, 2025

View reviewed changes

mwyrzykowski added the safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks label Jul 22, 2025

mwyrzykowski force-pushed the eng/155971582 branch from 9f07cb1 to 32af205 Compare July 22, 2025 21:42

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Jul 22, 2025

djg reviewed Jul 23, 2025

View reviewed changes

mwyrzykowski removed the merging-blocked Applied to prevent a change from being merged label Jul 23, 2025

mwyrzykowski force-pushed the eng/155971582 branch from 32af205 to f34ad83 Compare July 23, 2025 02:52

mwyrzykowski 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 Jul 23, 2025

webkit-commit-queue force-pushed the eng/155971582 branch from f34ad83 to ed52872 Compare July 23, 2025 04:58

webkit-commit-queue merged commit ed52872 into WebKit:main Jul 23, 2025

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jul 23, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly #48376

GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly #48376

Uh oh!

mwyrzykowski commented Jul 22, 2025 •

edited by webkit-early-warning-system

Loading

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

Uh oh!

webkit-ews-buildbot commented Jul 22, 2025

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

Uh oh!

tadeuzagallo Jul 22, 2025

Uh oh!

mwyrzykowski Jul 22, 2025

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

Uh oh!

djg Jul 23, 2025

Uh oh!

mwyrzykowski Jul 23, 2025

Uh oh!

webkit-early-warning-system commented Jul 23, 2025 •

edited

Loading

Uh oh!

webkit-commit-queue commented Jul 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly #48376

GPUBindGroupDescriptor::externalTextureMatches is implemented incorrectly #48376

Uh oh!

Conversation

mwyrzykowski commented Jul 22, 2025 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ed52872

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-ews-buildbot commented Jul 22, 2025

Safer C++ Build #45187 (b7a170d)

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tadeuzagallo Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

mwyrzykowski Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djg Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

mwyrzykowski Jul 23, 2025

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Jul 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-commit-queue commented Jul 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mwyrzykowski commented Jul 22, 2025 •

edited by webkit-early-warning-system

Loading

`ed52872`

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

Safer C++ Build #45187 (`b7a170d`)

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

webkit-early-warning-system commented Jul 22, 2025 •

edited

Loading

webkit-early-warning-system commented Jul 23, 2025 •

edited

Loading