Bug 1829305: fix(webgpu): trade incorrect ImageCopyBuffer usage for exploded ID and FFI-friendly ImageDataLayout in wgpu_server_encoder_copy_texture_to_buffer r=webgpu-reviewers,jimb

marco-c · marco-c · commit b66f1b424ca3 · 2023-05-01T00:29:45.000Z
Differential Revision: https://phabricator.services.mozilla.com/D176207 UltraBlame original commit: 40f7492787a9f27938eeffda38d9d77a81164f3b
diff --git a/dom/webgpu/ipc/WebGPUParent.cpp b/dom/webgpu/ipc/WebGPUParent.cpp
@@ -5869,18 +5869,6 @@ const
 ffi
 :
 :
-WGPUImageCopyBuffer
-bufView
-=
-{
-bufferId
-bufLayout
-}
-;
-const
-ffi
-:
-:
 WGPUExtent3d
 extent
 =
@@ -5919,8 +5907,9 @@ get
 aCommandEncoderId
 &
 texView
+bufferId
 &
-bufView
+bufLayout
 &
 extent
 )
diff --git a/gfx/wgpu_bindings/src/server.rs b/gfx/wgpu_bindings/src/server.rs
@@ -4351,16 +4351,22 @@ command
 :
 :
 ImageCopyTexture
-destination
+dst_buffer
 :
-&
 wgc
 :
 :
-command
+id
 :
 :
-ImageCopyBuffer
+BufferId
+dst_layout
+:
+&
+crate
+:
+:
+ImageDataLayout
 size
 :
 &
@@ -4370,6 +4376,29 @@ wgt
 Extent3d
 )
 {
+let
+destination
+=
+wgc
+:
+:
+command
+:
+:
+ImageCopyBuffer
+{
+buffer
+:
+dst_buffer
+layout
+:
+dst_layout
+.
+into_wgt
+(
+)
+}
+;
 gfx_select
 !
 (
@@ -4382,6 +4411,7 @@ command_encoder_copy_texture_to_buffer
 (
 self_id
 source
+&
 destination
 size
 )

Original file line number	Diff line number	Diff line change
`@@ -4351,16 +4351,22 @@ command`
`4351`	`4351`	`:`
`4352`	`4352`	`:`
`4353`	`4353`	`ImageCopyTexture`
`4354`		`-destination`
	`4354`	`+dst_buffer`
`4355`	`4355`	`:`
`4356`		`-&`
`4357`	`4356`	`wgc`
`4358`	`4357`	`:`
`4359`	`4358`	`:`
`4360`		`-command`
	`4359`	`+id`
`4361`	`4360`	`:`
`4362`	`4361`	`:`
`4363`		`-ImageCopyBuffer`
	`4362`	`+BufferId`
	`4363`	`+dst_layout`
	`4364`	`+:`
	`4365`	`+&`
	`4366`	`+crate`
	`4367`	`+:`
	`4368`	`+:`
	`4369`	`+ImageDataLayout`
`4364`	`4370`	`size`
`4365`	`4371`	`:`
`4366`	`4372`	`&`
`@@ -4370,6 +4376,29 @@ wgt`
`4370`	`4376`	`Extent3d`
`4371`	`4377`	`)`
`4372`	`4378`	`{`
	`4379`	`+let`
	`4380`	`+destination`
	`4381`	`+=`
	`4382`	`+wgc`
	`4383`	`+:`
	`4384`	`+:`
	`4385`	`+command`
	`4386`	`+:`
	`4387`	`+:`
	`4388`	`+ImageCopyBuffer`
	`4389`	`+{`
	`4390`	`+buffer`
	`4391`	`+:`
	`4392`	`+dst_buffer`
	`4393`	`+layout`
	`4394`	`+:`
	`4395`	`+dst_layout`
	`4396`	`+.`
	`4397`	`+into_wgt`
	`4398`	`+(`
	`4399`	`+)`
	`4400`	`+}`
	`4401`	`+;`
`4373`	`4402`	`gfx_select`
`4374`	`4403`	`!`
`4375`	`4404`	`(`
`@@ -4382,6 +4411,7 @@ command_encoder_copy_texture_to_buffer`
`4382`	`4411`	`(`
`4383`	`4412`	`self_id`
`4384`	`4413`	`source`
	`4414`	`+&`
`4385`	`4415`	`destination`
`4386`	`4416`	`size`
`4387`	`4417`	`)`