Add multithreaded upload to dynamic texture on Vulkan [Core feature] (#4028)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Adrian Cojocaru <adrian.cojocaru92@yahoo.com>
This commit is contained in:
@@ -158,7 +158,8 @@ void Texture2D::uploadSubRegion(const void* pixelData,
|
||||
const Size& size_,
|
||||
uint16_t xOffset,
|
||||
uint16_t yOffset,
|
||||
const vk::UniqueCommandBuffer& commandBuffer) noexcept {
|
||||
const vk::UniqueCommandBuffer& commandBuffer,
|
||||
DeletionQueue* deletionQueue) noexcept {
|
||||
if (!pixelData || size_.width == 0 || size_.height == 0) return;
|
||||
|
||||
create();
|
||||
@@ -189,7 +190,7 @@ void Texture2D::uploadSubRegion(const void* pixelData,
|
||||
memcpy(bufferAllocation->mappedBuffer, pixelData, bufferInfo.size);
|
||||
|
||||
const auto enqueueCommands = [&](const auto& buffer) {
|
||||
transitionToTransferLayout(buffer);
|
||||
transitionToTransferWriteLayout(buffer);
|
||||
|
||||
const auto region = vk::BufferImageCopy()
|
||||
.setBufferOffset(0)
|
||||
@@ -204,6 +205,8 @@ void Texture2D::uploadSubRegion(const void* pixelData,
|
||||
|
||||
if (samplerState.mipmapped && textureUsage == Texture2DUsage::ShaderInput) {
|
||||
generateMips(buffer);
|
||||
} else if (textureUsage == Texture2DUsage::Blit) {
|
||||
transitionToTransferReadLayout(buffer);
|
||||
} else {
|
||||
transitionToShaderReadLayout(buffer);
|
||||
}
|
||||
@@ -211,7 +214,15 @@ void Texture2D::uploadSubRegion(const void* pixelData,
|
||||
|
||||
enqueueCommands(commandBuffer);
|
||||
|
||||
context.enqueueDeletion([buffAlloc = std::move(bufferAllocation)](auto&) mutable { buffAlloc.reset(); });
|
||||
const auto function = [buffAlloc = std::move(bufferAllocation)](auto&) mutable {
|
||||
buffAlloc.reset();
|
||||
};
|
||||
|
||||
if (deletionQueue) {
|
||||
deletionQueue->push_back(std::move(function));
|
||||
} else {
|
||||
context.enqueueDeletion(std::move(function));
|
||||
}
|
||||
|
||||
context.renderingStats().numTextureUpdates++;
|
||||
context.renderingStats().textureUpdateBytes += bufferInfo.size;
|
||||
@@ -304,6 +315,12 @@ void Texture2D::createTexture() {
|
||||
imageUsage = vk::ImageUsageFlags() | vk::ImageUsageFlagBits::eTransferDst;
|
||||
imageTiling = vk::ImageTiling::eLinear;
|
||||
break;
|
||||
|
||||
case Texture2DUsage::Blit:
|
||||
imageUsage = vk::ImageUsageFlags() | vk::ImageUsageFlagBits::eSampled |
|
||||
vk::ImageUsageFlagBits::eTransferDst | vk::ImageUsageFlagBits::eTransferSrc;
|
||||
imageTiling = vk::ImageTiling::eLinear;
|
||||
break;
|
||||
}
|
||||
|
||||
const auto imageCreateInfo = vk::ImageCreateInfo()
|
||||
@@ -429,7 +446,7 @@ void Texture2D::destroySampler() {
|
||||
}
|
||||
}
|
||||
|
||||
void Texture2D::transitionToTransferLayout(const vk::UniqueCommandBuffer& buffer) {
|
||||
void Texture2D::transitionToTransferWriteLayout(const vk::UniqueCommandBuffer& buffer) {
|
||||
const auto barrier = vk::ImageMemoryBarrier()
|
||||
.setImage(imageAllocation->image)
|
||||
.setOldLayout(imageLayout)
|
||||
@@ -451,6 +468,28 @@ void Texture2D::transitionToTransferLayout(const vk::UniqueCommandBuffer& buffer
|
||||
imageLayout = barrier.newLayout;
|
||||
}
|
||||
|
||||
void Texture2D::transitionToTransferReadLayout(const vk::UniqueCommandBuffer& buffer) {
|
||||
const auto barrier = vk::ImageMemoryBarrier()
|
||||
.setImage(imageAllocation->image)
|
||||
.setOldLayout(imageLayout)
|
||||
.setNewLayout(vk::ImageLayout::eTransferSrcOptimal)
|
||||
.setSrcAccessMask(vk::AccessFlagBits::eTransferWrite)
|
||||
.setDstAccessMask(vk::AccessFlagBits::eTransferRead)
|
||||
.setSrcQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED)
|
||||
.setDstQueueFamilyIndex(VK_QUEUE_FAMILY_IGNORED)
|
||||
.setSubresourceRange({vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1});
|
||||
|
||||
buffer->pipelineBarrier(vk::PipelineStageFlagBits::eTransfer,
|
||||
vk::PipelineStageFlagBits::eTransfer,
|
||||
{},
|
||||
nullptr,
|
||||
nullptr,
|
||||
barrier,
|
||||
context.getBackend().getDispatcher());
|
||||
|
||||
imageLayout = barrier.newLayout;
|
||||
}
|
||||
|
||||
void Texture2D::transitionToShaderReadLayout(const vk::UniqueCommandBuffer& buffer) {
|
||||
const auto barrier = vk::ImageMemoryBarrier()
|
||||
.setImage(imageAllocation->image)
|
||||
@@ -503,7 +542,7 @@ const vk::Sampler& Texture2D::getVulkanSampler() {
|
||||
return sampler;
|
||||
}
|
||||
|
||||
void Texture2D::copyImage(vk::Image image) {
|
||||
void Texture2D::copyImage(vk::Image image, Size imageSize, uint16_t xOffset, uint16_t yOffset) {
|
||||
if (!image) return;
|
||||
|
||||
create();
|
||||
@@ -512,9 +551,10 @@ void Texture2D::copyImage(vk::Image image) {
|
||||
const auto copyInfo = vk::ImageCopy()
|
||||
.setSrcSubresource({vk::ImageAspectFlagBits::eColor, 0, 0, 1})
|
||||
.setDstSubresource({vk::ImageAspectFlagBits::eColor, 0, 0, 1})
|
||||
.setExtent({size.width, size.height, 1});
|
||||
.setExtent({imageSize.width, imageSize.height, 1})
|
||||
.setDstOffset({xOffset, yOffset, 0});
|
||||
|
||||
transitionToTransferLayout(commandBuffer);
|
||||
transitionToTransferWriteLayout(commandBuffer);
|
||||
commandBuffer->copyImage(image,
|
||||
vk::ImageLayout::eTransferSrcOptimal,
|
||||
imageAllocation->image,
|
||||
|
||||
Reference in New Issue
Block a user