GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix texture copy into staging one on DX12 and Vulkan

Browse Source
This commit is contained in:
Wojtek Figat
2024-05-28 14:56:38 +02:00
parent 8a2acd360d
commit 5f4c57d3eb
3 changed files with 90 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Source/Engine/GraphicsDevice/Vulkan/GPUContextVulkan.cpp
View File

@@ -1311,10 +1311,6 @@ void GPUContextVulkan::UpdateBuffer(GPUBuffer* buffer, const void* data, uint32
// Use direct update for small buffers
const uint32 alignedSize = Math::AlignUp<uint32>(size, 4);
if (alignedSize > buffer->GetSize())
{
int a= 1;
}
if (size <= 16 * 1024 && alignedSize <= buffer->GetSize())
{
//AddBufferBarrier(bufferVulkan, VK_ACCESS_TRANSFER_WRITE_BIT);
@@ -1413,37 +1409,77 @@ void GPUContextVulkan::CopyTexture(GPUTexture* dstResource, uint32 dstSubresourc
const auto dstTextureVulkan = static_cast<GPUTextureVulkan*>(dstResource);
const auto srcTextureVulkan = static_cast<GPUTextureVulkan*>(srcResource);
// Transition resources
AddImageBarrier(dstTextureVulkan, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
AddImageBarrier(srcTextureVulkan, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
FlushBarriers();
// Prepare
const int32 dstMipIndex = dstSubresource % dstTextureVulkan->MipLevels();
const int32 dstArrayIndex = dstSubresource / dstTextureVulkan->MipLevels();
const int32 srcMipIndex = srcSubresource % srcTextureVulkan->MipLevels();
const int32 srcArrayIndex = srcSubresource / srcTextureVulkan->MipLevels();
const int32 dstMipIndex = (int32)dstSubresource % dstTextureVulkan->MipLevels();
const int32 dstArrayIndex = (int32)dstSubresource / dstTextureVulkan->MipLevels();
const int32 srcMipIndex = (int32)srcSubresource % srcTextureVulkan->MipLevels();
const int32 srcArrayIndex = (int32)srcSubresource / srcTextureVulkan->MipLevels();
int32 mipWidth, mipHeight, mipDepth;
srcTextureVulkan->GetMipSize(srcMipIndex, mipWidth, mipHeight, mipDepth);
// Copy
VkImageCopy region;
Platform::MemoryClear(&region, sizeof(VkBufferImageCopy));
region.extent.width = mipWidth;
region.extent.height = mipHeight;
region.extent.depth = mipDepth;
region.dstOffset.x = dstX;
region.dstOffset.y = dstY;
region.dstOffset.z = dstZ;
region.srcSubresource.baseArrayLayer = srcArrayIndex;
region.srcSubresource.layerCount = 1;
region.srcSubresource.mipLevel = srcMipIndex;
region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.dstSubresource.baseArrayLayer = dstArrayIndex;
region.dstSubresource.layerCount = 1;
region.dstSubresource.mipLevel = dstMipIndex;
region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
vkCmdCopyImage(cmdBuffer->GetHandle(), srcTextureVulkan->GetHandle(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dstTextureVulkan->GetHandle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
if (dstTextureVulkan->IsStaging())
{
// Staging Texture -> Staging Texture
if (srcTextureVulkan->IsStaging())
{
ASSERT(dstTextureVulkan->StagingBuffer && srcTextureVulkan->StagingBuffer);
CopyResource(dstTextureVulkan->StagingBuffer, srcTextureVulkan->StagingBuffer);
}
// Texture -> Staging Texture
else
{
// Transition resources
ASSERT(dstTextureVulkan->StagingBuffer);
AddBufferBarrier(dstTextureVulkan->StagingBuffer, VK_ACCESS_TRANSFER_WRITE_BIT);
AddImageBarrier(srcTextureVulkan, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
FlushBarriers();
// Copy
VkBufferImageCopy region;
Platform::MemoryClear(&region, sizeof(VkBufferImageCopy));
region.bufferOffset = 0; // TODO: calculate it based on dstSubresource and dstX/dstY/dstZ
ASSERT(dstX == dstY == dstZ == 0);
ASSERT(dstSubresource == 0);
region.bufferRowLength = mipWidth;
region.bufferImageHeight = mipHeight;
region.imageOffset.x = 0;
region.imageOffset.y = 0;
region.imageOffset.z = 0;
region.imageExtent.width = mipWidth;
region.imageExtent.height = mipHeight;
region.imageExtent.depth = mipDepth;
region.imageSubresource.baseArrayLayer = srcArrayIndex;
region.imageSubresource.layerCount = 1;
region.imageSubresource.mipLevel = srcMipIndex;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
vkCmdCopyImageToBuffer(cmdBuffer->GetHandle(), srcTextureVulkan->GetHandle(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dstTextureVulkan->StagingBuffer->GetHandle(), 1, &region);
}
}
else
{
// Transition resources
AddImageBarrier(dstTextureVulkan, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
AddImageBarrier(srcTextureVulkan, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
FlushBarriers();
// Copy
VkImageCopy region;
Platform::MemoryClear(&region, sizeof(VkBufferImageCopy));
region.extent.width = mipWidth;
region.extent.height = mipHeight;
region.extent.depth = mipDepth;
region.dstOffset.x = (int32_t)dstX;
region.dstOffset.y = (int32_t)dstY;
region.dstOffset.z = (int32_t)dstZ;
region.srcSubresource.baseArrayLayer = srcArrayIndex;
region.srcSubresource.layerCount = 1;
region.srcSubresource.mipLevel = srcMipIndex;
region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
region.dstSubresource.baseArrayLayer = dstArrayIndex;
region.dstSubresource.layerCount = 1;
region.dstSubresource.mipLevel = dstMipIndex;
region.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
vkCmdCopyImage(cmdBuffer->GetHandle(), srcTextureVulkan->GetHandle(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dstTextureVulkan->GetHandle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region);
}
}
void GPUContextVulkan::ResetCounter(GPUBuffer* buffer)