Skip to content

support faster texture updates for vulkan renderer #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support faster texture updates for vulkan renderer #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions renderer/include/rive/renderer/vulkan/render_context_vulkan_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ class RenderContextVulkanImpl : public RenderContextImpl
uint32_t mipLevelCount,
const uint8_t imageDataRGBAPremul[]) override;

rcp<Texture> makeImageTexture(uint32_t width, uint32_t height,
uint32_t mipLevelCount,
rcp<vkutil::Buffer> imageBufferRGBAPremul);

void hotloadShaders(rive::Span<const uint32_t> spirvData);

private:
Expand Down
3 changes: 3 additions & 0 deletions renderer/include/rive/renderer/vulkan/vkutil.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ class Texture2D : public rive::gpu::Texture
// Deferred mechanism for uploading image data without a command buffer.
void scheduleUpload(const void* imageData, size_t imageDataSizeInBytes);

// Deferred mechanism for uploading image data without a command buffer.
void scheduleUpload(rcp<vkutil::Buffer> imageBuffer);

void barrier(VkCommandBuffer,
const ImageAccess& dstAccess,
ImageAccessAction = ImageAccessAction::preserveContents,
Expand Down
14 changes: 14 additions & 0 deletions renderer/src/vulkan/render_context_vulkan_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,20 @@ rcp<Texture> RenderContextVulkanImpl::makeImageTexture(
return texture;
}

rcp<Texture> RenderContextVulkanImpl::makeImageTexture(
uint32_t width, uint32_t height, uint32_t mipLevelCount,
rcp<vkutil::Buffer> imageBufferRGBAPremul)
{
assert(imageBufferRGBAPremul->info().size >= height * width * 4);
auto texture = m_vk->makeTexture2D({
.format = VK_FORMAT_R8G8B8A8_UNORM,
.extent = {width, height},
.mipLevels = mipLevelCount,
});
texture->scheduleUpload(imageBufferRGBAPremul);
return texture;
}

// Renders color ramps to the gradient texture.
class RenderContextVulkanImpl::ColorRampPipeline
{
Expand Down
22 changes: 14 additions & 8 deletions renderer/src/vulkan/vkutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,20 @@ Texture2D::Texture2D(rcp<VulkanContext> vk, VkImageCreateInfo info) :
void Texture2D::scheduleUpload(const void* imageData,
size_t imageDataSizeInBytes)
{
m_imageUploadBuffer = m_image->vk()->makeBuffer(
{
.size = imageDataSizeInBytes,
.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
},
vkutil::Mappability::writeOnly);
memcpy(m_imageUploadBuffer->contents(), imageData, imageDataSizeInBytes);
m_imageUploadBuffer->flushContents();
rcp<vkutil::Buffer> imageUploadBuffer = m_image->vk()->makeBuffer(
{
.size = imageDataSizeInBytes,
.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
},
vkutil::Mappability::writeOnly);
memcpy(imageUploadBuffer->contents(), imageData, imageDataSizeInBytes);
scheduleUpload(imageUploadBuffer);
}

void Texture2D::scheduleUpload(rcp<vkutil::Buffer> imageBuffer)
{
m_imageUploadBuffer = imageBuffer;
m_imageUploadBuffer->flushContents();
}

void Texture2D::applyImageUploadBuffer(VkCommandBuffer commandBuffer)
Expand Down