Maybe fix dx12 depth-stencil issue?

Author: andyleiserson

wgpu-core/src/command/transfer.rs

@@ -1,4 +1,4 @@
-use alloc::{format, string::String, sync::Arc, vec::Vec};
+use alloc::{format, string::String, sync::Arc, vec, vec::Vec};
 
 use arrayvec::ArrayVec;
 use thiserror::Error;
@@ -922,19 +922,40 @@ impl Global {
                 ),
             );
 
-            let regions = (0..array_layer_count)
-                .map(|rel_array_layer| {
-                    let mut texture_base = dst_base.clone();
-                    texture_base.array_layer += rel_array_layer;
-                    let mut buffer_layout = source.layout;
-                    buffer_layout.offset += rel_array_layer as u64 * bytes_per_array_layer;
+            let regions = if dst_base.aspect == hal::FormatAspects::DEPTH_STENCIL {
+                vec![
                     hal::BufferTextureCopy {
-                        buffer_layout,
-                        texture_base,
+                        texture_base: hal::TextureCopyBase {
+                            aspect: hal::FormatAspects::DEPTH,
+                            ..dst_base
+                        },
+                        buffer_layout: source.layout.clone(),
                         size: hal_copy_size,
-                    }
-                })
-                .collect::<Vec<_>>();
+                    },
+                    hal::BufferTextureCopy {
+                        texture_base: hal::TextureCopyBase {
+                            aspect: hal::FormatAspects::STENCIL,
+                            ..dst_base
+                        },
+                        buffer_layout: source.layout.clone(),
+                        size: hal_copy_size,
+                    },
+                ]
+            } else {
+                (0..array_layer_count)
+                    .map(|rel_array_layer| {
+                        let mut texture_base = dst_base.clone();
+                        texture_base.array_layer += rel_array_layer;
+                        let mut buffer_layout = source.layout.clone();
+                        buffer_layout.offset += rel_array_layer as u64 * bytes_per_array_layer;
+                        hal::BufferTextureCopy {
+                            buffer_layout,
+                            texture_base,
+                            size: hal_copy_size,
+                        }
+                    })
+                    .collect()
+            };
 
             let cmd_buf_raw = cmd_buf_data.encoder.open()?;
             unsafe {
@@ -1278,19 +1299,40 @@ impl Global {
                 height: src_copy_size.height.min(dst_copy_size.height),
                 depth: src_copy_size.depth.min(dst_copy_size.depth),
             };
-            let regions = (0..array_layer_count)
-                .map(|rel_array_layer| {
-                    let mut src_base = src_tex_base.clone();
-                    let mut dst_base = dst_tex_base.clone();
-                    src_base.array_layer += rel_array_layer;
-                    dst_base.array_layer += rel_array_layer;
+            let regions = if dst_tex_base.aspect == hal::FormatAspects::DEPTH_STENCIL {
+                vec![
                     hal::TextureCopy {
-                        src_base,
-                        dst_base,
+                        src_base: src_tex_base.clone(),
+                        dst_base: hal::TextureCopyBase {
+                            aspect: hal::FormatAspects::DEPTH,
+                            ..dst_tex_base
+                        },
                         size: hal_copy_size,
-                    }
-                })
-                .collect::<Vec<_>>();
+                    },
+                    hal::TextureCopy {
+                        src_base: src_tex_base.clone(),
+                        dst_base: hal::TextureCopyBase {
+                            aspect: hal::FormatAspects::STENCIL,
+                            ..dst_tex_base
+                        },
+                        size: hal_copy_size,
+                    },
+                ]
+            } else {
+                (0..array_layer_count)
+                    .map(|rel_array_layer| {
+                        let mut src_base = src_tex_base.clone();
+                        let mut dst_base = dst_tex_base.clone();
+                        src_base.array_layer += rel_array_layer;
+                        dst_base.array_layer += rel_array_layer;
+                        hal::TextureCopy {
+                            src_base,
+                            dst_base,
+                            size: hal_copy_size,
+                        }
+                    })
+                    .collect()
+            };
             let cmd_buf_raw = cmd_buf_data.encoder.open()?;
             unsafe {
                 cmd_buf_raw.transition_textures(&barriers);