Convert texture format to the correct format before passing it to GetCopyableFootprints

Author: 39ali

wgpu-hal/src/auxil/dxgi/conv.rs

@@ -136,6 +136,33 @@ pub fn map_texture_format_for_srv_uav(
     })
 }
 
+// see https://microsoft.github.io/DirectX-Specs/d3d/PlanarDepthStencilDDISpec.html#planar-layout-for-staging-from-buffer
+pub fn map_texture_format_for_copy(
+    format: wgt::TextureFormat,
+    aspect: crate::FormatAspects,
+) -> Option<dxgiformat::DXGI_FORMAT> {
+    Some(match (format, aspect) {
+        (wgt::TextureFormat::Depth16Unorm, crate::FormatAspects::DEPTH) => {
+            dxgiformat::DXGI_FORMAT_R16_UNORM
+        }
+        (
+            wgt::TextureFormat::Depth32Float | wgt::TextureFormat::Depth32FloatStencil8,
+            crate::FormatAspects::DEPTH,
+        ) => dxgiformat::DXGI_FORMAT_R32_FLOAT,
+
+        (
+            wgt::TextureFormat::Stencil8
+            | wgt::TextureFormat::Depth24PlusStencil8
+            | wgt::TextureFormat::Depth32FloatStencil8,
+            crate::FormatAspects::STENCIL,
+        ) => dxgiformat::DXGI_FORMAT_R8_UINT,
+
+        (format, crate::FormatAspects::COLOR) => map_texture_format(format),
+
+        _ => return None,
+    })
+}
+
 pub fn map_texture_format_for_resource(
     format: wgt::TextureFormat,
     usage: crate::TextureUses,

wgpu-hal/src/dx12/command.rs

@@ -20,11 +20,20 @@ impl crate::BufferTextureCopy {
         &self,
         device: &d3d12_ty::ID3D12Device,
         mut desc: d3d12_ty::D3D12_RESOURCE_DESC,
+        format: wgt::TextureFormat,
     ) -> d3d12_ty::D3D12_PLACED_SUBRESOURCE_FOOTPRINT {
         desc.Width = self.size.width as u64;
         desc.Height = self.size.height;
         desc.DepthOrArraySize = self.size.depth as u16;
         desc.MipLevels = 1;
+        desc.Flags = 0;
+
+        if let Some(fmt) =
+            auxil::dxgi::conv::map_texture_format_for_copy(format, self.texture_base.aspect)
+        {
+            desc.Format = fmt;
+        }
+
         let mut fp = d3d12_ty::D3D12_PLACED_SUBRESOURCE_FOOTPRINT::default();
         unsafe {
             device.GetCopyableFootprints(
@@ -38,6 +47,11 @@ impl crate::BufferTextureCopy {
                 ptr::null_mut(),
             );
         }
+        fp.Footprint.RowPitch = wgt::math::align_to(
+            fp.Footprint.RowPitch,
+            d3d12_ty::D3D12_TEXTURE_DATA_PITCH_ALIGNMENT,
+        );
+
         fp
     }
 }
@@ -545,7 +559,7 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
             let src_box = make_box(&wgt::Origin3d::ZERO, &r.size);
             unsafe {
                 *src_location.u.PlacedFootprint_mut() =
-                    r.to_subresource_footprint(&self.device, dst.resource.GetDesc());
+                    r.to_subresource_footprint(&self.device, dst.resource.GetDesc(), dst.format);
             };
             unsafe {
                 *dst_location.u.SubresourceIndex_mut() =
@@ -592,7 +606,7 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
             };
             unsafe {
                 *dst_location.u.PlacedFootprint_mut() =
-                    r.to_subresource_footprint(&self.device, src.resource.GetDesc());
+                    r.to_subresource_footprint(&self.device, src.resource.GetDesc(), src.format);
             };
             unsafe { list.CopyTextureRegion(&dst_location, 0, 0, 0, &src_location, &src_box) };
         }