[D3D11] Fixed image buffer size in D3D11RenderSystem::ReadTexture().

LukasBanana · Feb 13, 2025 · 6813059 · 6813059
1 parent 521bf73
commit 6813059
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/sources/Core/ImageFlags.cpp b/sources/Core/ImageFlags.cpp
@@ -741,8 +741,16 @@ LLGL_EXPORT std::size_t ConvertImageBuffer(
     {
         const std::size_t numPixels = (extent.width * extent.height * extent.depth);
         const std::size_t requiredImageSize = GetMemoryFootprint(dstImageView.format, dstImageView.dataType, numPixels);
-        LLGL_ASSERT(dstImageView.dataSize >= requiredImageSize);
-        LLGL_ASSERT(srcImageView.dataSize >= requiredImageSize);
+        LLGL_ASSERT(
+            dstImageView.dataSize >= requiredImageSize,
+            "dstImageView.dataSize must be at least %zu, but %zu was specified",
+            requiredImageSize, dstImageView.dataSize
+        );
+        LLGL_ASSERT(
+            srcImageView.dataSize >= requiredImageSize,
+            "srcImageView.dataSize must be at least %zu, but %zu was specified",
+            requiredImageSize, srcImageView.dataSize
+        );
         ::memcpy(dstImageView.data, srcImageView.data, requiredImageSize);
         return requiredImageSize;
     }

diff --git a/sources/Renderer/Direct3D11/D3D11RenderSystem.cpp b/sources/Renderer/Direct3D11/D3D11RenderSystem.cpp
@@ -354,7 +354,7 @@ void D3D11RenderSystem::ReadTexture(Texture& texture, const TextureRegion& textu
             formatAttribs.format,
             formatAttribs.dataType,
             mappedSubresource.pData,
-            mappedSubresource.DepthPitch,
+            mappedSubresource.DepthPitch * extent.depth,
             mappedSubresource.RowPitch
         };
         const std::size_t bytesWritten = ConvertImageBuffer(intermediateSrcView, intermediateDstView, extent, LLGL_MAX_THREAD_COUNT, true);