dx12

Author: beicause

wgpu-hal/src/dx12/command.rs

@@ -506,8 +506,56 @@ impl crate::CommandEncoder for super::CommandEncoder {
         T: Iterator<Item = crate::TextureBarrier<'a, super::Texture>>,
     {
         self.temp.barriers.clear();
+        self.temp.texture_barriers.clear();
+
+        let mut barriers_ds_split = core::mem::take(&mut self.temp.texture_barriers)
+            .into_iter()
+            .map(|_| -> crate::TextureBarrier<'a, super::Texture> { unreachable!() })
+            .collect::<Vec<_>>();
 
         for barrier in barriers {
+            // For depth stencil textures, we generate one `TextureBarrier` with `TextureAspect::All`,
+            // but in DX12 depth and stencil are subresources and need to be transitioned separately
+            // to separate their read-only states.
+            if barrier.usage.from.intersects(
+                wgt::TextureUses::DEPTH_READ
+                    | wgt::TextureUses::DEPTH_WRITE
+                    | wgt::TextureUses::STENCIL_READ
+                    | wgt::TextureUses::STENCIL_WRITE,
+            ) || barrier.usage.to.intersects(
+                wgt::TextureUses::DEPTH_READ
+                    | wgt::TextureUses::DEPTH_WRITE
+                    | wgt::TextureUses::STENCIL_READ
+                    | wgt::TextureUses::STENCIL_WRITE,
+            ) {
+                let mut barrier_depth = barrier;
+                let mut barrier_stencil = barrier;
+
+                barrier_depth.range.aspect = wgt::TextureAspect::DepthOnly;
+                barrier_depth
+                    .usage
+                    .from
+                    .remove(wgt::TextureUses::STENCIL_READ | wgt::TextureUses::STENCIL_WRITE);
+                barrier_depth
+                    .usage
+                    .to
+                    .remove(wgt::TextureUses::STENCIL_READ | wgt::TextureUses::STENCIL_WRITE);
+
+                barrier_stencil.range.aspect = wgt::TextureAspect::StencilOnly;
+                barrier_stencil
+                    .usage
+                    .from
+                    .remove(wgt::TextureUses::DEPTH_READ | wgt::TextureUses::DEPTH_WRITE);
+                barrier_stencil
+                    .usage
+                    .to
+                    .remove(wgt::TextureUses::DEPTH_READ | wgt::TextureUses::DEPTH_WRITE);
+            } else {
+                barriers_ds_split.push(barrier);
+            }
+        }
+
+        for barrier in barriers_ds_split {
             let s0 = conv::map_texture_usage_to_state(barrier.usage.from);
             let s1 = conv::map_texture_usage_to_state(barrier.usage.to);
             if s0 != s1 {
@@ -598,6 +646,11 @@ impl crate::CommandEncoder for super::CommandEncoder {
                     .ResourceBarrier(&self.temp.barriers)
             };
         }
+
+        self.temp.texture_barriers = barriers_ds_split
+            .into_iter()
+            .map(|_| -> crate::TextureBarrier<'static, super::Texture> { unreachable!() })
+            .collect();
     }
 
     unsafe fn clear_buffer(&mut self, buffer: &super::Buffer, range: crate::MemoryRange) {

wgpu-hal/src/dx12/mod.rs

@@ -854,13 +854,15 @@ unsafe impl Sync for Queue {}
 #[derive(Default)]
 struct Temp {
     marker: Vec<u16>,
+    texture_barriers: Vec<crate::TextureBarrier<'static, Texture>>,
     barriers: Vec<Direct3D12::D3D12_RESOURCE_BARRIER>,
 }
 
 impl Temp {
     fn clear(&mut self) {
         self.marker.clear();
         self.barriers.clear();
+        self.texture_barriers.clear();
     }
 }