Fix copying depth stencil to depth stencil

XenoAtom · Jun 29, 2024 · d49b341 · d49b341
1 parent 81240a9
commit d49b341
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 2 deletions.
diff --git a/src/XenoAtom.Graphics.Tests/TextureTests.cs b/src/XenoAtom.Graphics.Tests/TextureTests.cs
@@ -919,6 +919,50 @@ public unsafe void MapWrite_ThenMapRead_1D()
             GD.Unmap(tex1D);
         }
 
+
+        [Fact]
+        public unsafe void Copy_DepthStencil()
+        {
+            Texture depthTarget = RF.CreateTexture(
+                TextureDescription.Texture2D(64, 64, 1, 1, PixelFormat.D32_Float_S8_UInt, TextureUsage.DepthStencil));
+
+            Texture depthTarget1 = RF.CreateTexture(
+                TextureDescription.Texture2D(64, 64, 1, 1, PixelFormat.D32_Float_S8_UInt, TextureUsage.DepthStencil));
+
+            Framebuffer fb = RF.CreateFramebuffer(new FramebufferDescription(depthTarget));
+            {
+                using CommandList cl = RF.CreateCommandList();
+                cl.Begin();
+                cl.SetFramebuffer(fb);
+                cl.ClearDepthStencil(0.5f, 12);
+                cl.End();
+                GD.SubmitCommands(cl);
+            }
+
+            Texture copySrcFromDepth = RF.CreateTexture(TextureDescription.Texture2D(
+                64, 64, 1, 1, PixelFormat.R32_Float, TextureUsage.Staging));
+
+            {
+                using CommandList cl = RF.CreateCommandList();
+                cl.Begin();
+                cl.CopyTexture(depthTarget, 0, 0, 0, 0, 0, depthTarget1, 0, 0, 0, 0, 0, 64, 64, 1, 1);
+                cl.CopyTexture(depthTarget1, 0, 0, 0, 0, 0, copySrcFromDepth, 0, 0, 0, 0, 0, 64, 64, 1, 1);
+                cl.End();
+                GD.SubmitCommands(cl);
+            }
+            GD.WaitForIdle();
+
+            {
+                MappedResourceView<float> view = GD.Map<float>(copySrcFromDepth, MapMode.Read);
+                for (int i = 0; i < 64 * 64; i++)
+                {
+                    Assert.Equal(0.5f, view[i]);
+                }
+                GD.Unmap(copySrcFromDepth);
+            }
+        }
+
+
         [Fact]
         public unsafe void Copy_1DTo2D()
         {

diff --git a/src/XenoAtom.Graphics/Vk/VkCommandList.cs b/src/XenoAtom.Graphics/Vk/VkCommandList.cs
@@ -867,17 +867,35 @@ internal static void CopyTextureCore_VkCommandBuffer(
 
             if (!sourceIsStaging && !destIsStaging)
             {
+                var srcAspect = (srcVkTexture.Usage & TextureUsage.DepthStencil) == TextureUsage.DepthStencil
+                    ? (FormatHelpers.IsStencilFormat(srcVkTexture.Format)
+                        ? VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT
+                        : VK_IMAGE_ASPECT_DEPTH_BIT)
+                    : VK_IMAGE_ASPECT_COLOR_BIT;
+
+                var dstAspect = (dstVkTexture.Usage & TextureUsage.DepthStencil) == TextureUsage.DepthStencil
+                    ? (FormatHelpers.IsStencilFormat(dstVkTexture.Format)
+                        ? VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT
+                        : VK_IMAGE_ASPECT_DEPTH_BIT)
+                    : VK_IMAGE_ASPECT_COLOR_BIT;
+
+                if (srcAspect != dstAspect)
+                {
+                    throw new InvalidOperationException($"Source texture with aspect `{srcAspect}` and destination texture with aspect `{dstAspect}` must have the same aspect.");
+                }
+
                 VkImageSubresourceLayers srcSubresource = new VkImageSubresourceLayers
                 {
-                    aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+                    aspectMask = srcAspect,
                     layerCount = layerCount,
                     mipLevel = srcMipLevel,
                     baseArrayLayer = srcBaseArrayLayer
                 };
 
+
                 VkImageSubresourceLayers dstSubresource = new VkImageSubresourceLayers
                 {
-                    aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
+                    aspectMask = dstAspect,
                     layerCount = layerCount,
                     mipLevel = dstMipLevel,
                     baseArrayLayer = dstBaseArrayLayer