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

Differential Revision: https://phabricator.services.mozilla.com/D176207

UltraBlame original commit: 40f7492787a9f27938eeffda38d9d77a81164f3b

Author: marco-c

dom/webgpu/ipc/WebGPUParent.cpp

@@ -938,17 +938,14 @@ ipc::IPCResult WebGPUParent::RecvSwapChainPresent(
       &data->mSourcePitch,
       nullptr,
   };
-  const ffi::WGPUImageCopyBuffer bufView = {
-      bufferId,
-      bufLayout,
-  };
   const ffi::WGPUExtent3d extent = {
       static_cast<uint32_t>(size.width),
       static_cast<uint32_t>(size.height),
       1,
   };
   ffi::wgpu_server_encoder_copy_texture_to_buffer(
-      mContext.get(), aCommandEncoderId, &texView, &bufView, &extent);
+      mContext.get(), aCommandEncoderId, &texView, bufferId, &bufLayout,
+      &extent);
   ffi::WGPUCommandBufferDescriptor commandDesc = {};
   {
     ErrorBuffer error;

gfx/wgpu_bindings/src/server.rs

@@ -758,10 +758,15 @@ pub unsafe extern "C" fn wgpu_server_encoder_copy_texture_to_buffer(
     global: &Global,
     self_id: id::CommandEncoderId,
     source: &wgc::command::ImageCopyTexture,
-    destination: &wgc::command::ImageCopyBuffer,
+    dst_buffer: wgc::id::BufferId,
+    dst_layout: &crate::ImageDataLayout,
     size: &wgt::Extent3d,
 ) {
-    gfx_select!(self_id => global.command_encoder_copy_texture_to_buffer(self_id, source, destination, size)).unwrap();
+    let destination = wgc::command::ImageCopyBuffer {
+        buffer: dst_buffer,
+        layout: dst_layout.into_wgt(),
+    };
+    gfx_select!(self_id => global.command_encoder_copy_texture_to_buffer(self_id, source, &destination, size)).unwrap();
 }