From 295fb214d524e72fc7136a8647e28e71f59d075e Mon Sep 17 00:00:00 2001 From: niki Date: Mon, 11 Mar 2024 13:47:43 +0100 Subject: [PATCH] vulkan: remove unused constant and use correct sizes for mapping the local uniform stream buffer --- src/modules/graphics/vulkan/Graphics.cpp | 6 ++++-- src/modules/graphics/vulkan/Shader.cpp | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp index ab1f799ef..2e1360f1b 100644 --- a/src/modules/graphics/vulkan/Graphics.cpp +++ b/src/modules/graphics/vulkan/Graphics.cpp @@ -2877,12 +2877,14 @@ void Graphics::mapLocalUniformData(void *data, size_t size, VkDescriptorBufferIn if (localUniformBuffer->getUsableSize() < alignedSize) localUniformBuffer.set(new StreamBuffer(this, BUFFERUSAGE_UNIFORM, localUniformBuffer->getSize() * 2), Acquire::NORETAIN); - auto mapInfo = localUniformBuffer->map(alignedSize); + auto mapInfo = localUniformBuffer->map(size); memcpy(mapInfo.data, data, size); bufferInfo.buffer = (VkBuffer)localUniformBuffer->getHandle(); - bufferInfo.offset = localUniformBuffer->unmap(alignedSize); + bufferInfo.offset = localUniformBuffer->unmap(size); bufferInfo.range = size; + + localUniformBuffer->markUsed(alignedSize); } void Graphics::createColorResources() diff --git a/src/modules/graphics/vulkan/Shader.cpp b/src/modules/graphics/vulkan/Shader.cpp index ba2a1d9a2..1c70616c0 100644 --- a/src/modules/graphics/vulkan/Shader.cpp +++ b/src/modules/graphics/vulkan/Shader.cpp @@ -36,7 +36,6 @@ namespace graphics namespace vulkan { -static const uint32_t STREAMBUFFER_DEFAULT_SIZE = 16; static const uint32_t DESCRIPTOR_POOL_SIZE = 1000; class BindingMapper