dx12 fix barrier

Author: beicause

wgpu-core/src/conv.rs

@@ -122,11 +122,14 @@ pub fn map_texture_usage(
         usage.contains(wgt::TextureUsages::RENDER_ATTACHMENT) && is_color,
     );
     u.set(
-        wgt::TextureUses::DEPTH_WRITE
-            | wgt::TextureUses::DEPTH_READ
-            | wgt::TextureUses::STENCIL_WRITE
-            | wgt::TextureUses::STENCIL_READ,
-        usage.contains(wgt::TextureUsages::RENDER_ATTACHMENT) && !is_color,
+        wgt::TextureUses::DEPTH_WRITE | wgt::TextureUses::DEPTH_READ,
+        usage.contains(wgt::TextureUsages::RENDER_ATTACHMENT)
+            && aspect.intersects(hal::FormatAspects::DEPTH),
+    );
+    u.set(
+        wgt::TextureUses::STENCIL_WRITE | wgt::TextureUses::STENCIL_READ,
+        usage.contains(wgt::TextureUsages::RENDER_ATTACHMENT)
+            && aspect.intersects(hal::FormatAspects::STENCIL),
     );
     u.set(
         wgt::TextureUses::STORAGE_ATOMIC,

wgpu-hal/src/dx12/command.rs

@@ -528,32 +528,38 @@ impl crate::CommandEncoder for super::CommandEncoder {
                     | wgt::TextureUses::STENCIL_READ
                     | wgt::TextureUses::STENCIL_WRITE,
             ) {
-                let mut barrier_stencil = crate::TextureBarrier {
-                    texture: barrier.texture,
-                    range: barrier.range,
-                    usage: barrier.usage.clone(),
-                };
-                let mut barrier_depth = 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);
+                if barrier.texture.format.has_stencil_aspect() {
+                    let mut barrier_stencil = crate::TextureBarrier {
+                        texture: barrier.texture,
+                        range: barrier.range,
+                        usage: barrier.usage.clone(),
+                    };
+                    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);
+                    barriers_ds_split.push(barrier_stencil);
+                }
+
+                if barrier.texture.format.has_depth_aspect() {
+                    let mut barrier_depth = 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);
+                    barriers_ds_split.push(barrier_depth);
+                }
             } else {
                 barriers_ds_split.push(barrier);
             }