From 5a0a2fccfe3d150a188aecf8b62c2c981d06d497 Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Wed, 24 Sep 2025 19:39:22 +0200 Subject: [PATCH] updating kvf --- runtime/Sources/Renderer/Buffer.cpp | 2 +- third_party/kvf.h | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/runtime/Sources/Renderer/Buffer.cpp b/runtime/Sources/Renderer/Buffer.cpp index c34f965..f8ef1b9 100644 --- a/runtime/Sources/Renderer/Buffer.cpp +++ b/runtime/Sources/Renderer/Buffer.cpp @@ -81,7 +81,7 @@ namespace mlx VkCommandBuffer cmd = kvfCreateCommandBuffer(RenderCore::Get().GetDevice()); kvfBeginCommandBuffer(cmd, VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT); - kvfCopyBufferToBuffer(cmd, m_buffer, buffer.Get(), m_size); + kvfCopyBufferToBuffer(cmd, m_buffer, buffer.Get(), m_size, 0, 0); kvfEndCommandBuffer(cmd); VkFence fence = kvfCreateFence(RenderCore::Get().GetDevice()); kvfSubmitSingleTimeCommandBuffer(RenderCore::Get().GetDevice(), cmd, KVF_GRAPHICS_QUEUE, fence); diff --git a/third_party/kvf.h b/third_party/kvf.h index bd972e2..bda9a57 100755 --- a/third_party/kvf.h +++ b/third_party/kvf.h @@ -51,7 +51,7 @@ #ifndef KBZ_8_VULKAN_FRAMEWORK_H #define KBZ_8_VULKAN_FRAMEWORK_H -#ifdef KVF_IMPL_VK_NO_PROTOTYPES +#if defined(KVF_IMPL_VK_NO_PROTOTYPES) && !defined(VK_NO_PROTOTYPES) #define VK_NO_PROTOTYPES #endif @@ -159,7 +159,7 @@ VkSampler kvfCreateSampler(VkDevice device, VkFilter filters, VkSamplerAddressMo void kvfDestroySampler(VkDevice device, VkSampler sampler); VkBuffer kvfCreateBuffer(VkDevice device, VkBufferUsageFlags usage, VkDeviceSize size); -void kvfCopyBufferToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkBuffer src, size_t size); +void kvfCopyBufferToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkBuffer src, size_t size, size_t src_offset, size_t dst_offset); void kvfCopyBufferToImage(VkCommandBuffer cmd, VkImage dst, VkBuffer src, size_t buffer_offset, VkImageAspectFlagBits aspect, VkExtent3D extent); void kvfDestroyBuffer(VkDevice device, VkBuffer buffer); @@ -374,12 +374,12 @@ void kvfCheckVk(VkResult result); #ifdef KVF_DESCRIPTOR_POOL_CAPACITY #undef KVF_DESCRIPTOR_POOL_CAPACITY #endif -#define KVF_DESCRIPTOR_POOL_CAPACITY 512 +#define KVF_DESCRIPTOR_POOL_CAPACITY 1024 #ifdef KVF_COMMAND_POOL_CAPACITY #undef KVF_COMMAND_POOL_CAPACITY #endif -#define KVF_COMMAND_POOL_CAPACITY 512 +#define KVF_COMMAND_POOL_CAPACITY 1024 typedef struct { @@ -560,6 +560,7 @@ void __kvfCompleteDevice(VkPhysicalDevice physical, VkDevice device) kvf_device->device = device; kvf_device->cmd_pool = pool; + kvf_device->callbacks = NULL; kvf_device->sets_pools = NULL; kvf_device->sets_pools_size = 0; kvf_device->cmd_buffers_size = 0; @@ -2274,7 +2275,7 @@ VkBuffer kvfCreateBuffer(VkDevice device, VkBufferUsageFlags usage, VkDeviceSize return buffer; } -void kvfCopyBufferToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkBuffer src, size_t size) +void kvfCopyBufferToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkBuffer src, size_t size, size_t src_offset, size_t dst_offset) { KVF_ASSERT(cmd != VK_NULL_HANDLE); KVF_ASSERT(dst != VK_NULL_HANDLE); @@ -2285,6 +2286,8 @@ void kvfCopyBufferToBuffer(VkCommandBuffer cmd, VkBuffer dst, VkBuffer src, size #endif VkBufferCopy copy_region = {}; copy_region.size = size; + copy_region.srcOffset = src_offset; + copy_region.dstOffset = dst_offset; KVF_GET_DEVICE_FUNCTION(vkCmdCopyBuffer)(cmd, src, dst, 1, ©_region); } @@ -2540,7 +2543,7 @@ VkAttachmentDescription kvfBuildAttachmentDescription(KvfImageType type, VkForma __KvfSwapchain* kvf_swapchain = __kvfGetKvfSwapchainFromVkSwapchainKHR(swapchain); KVF_ASSERT(kvf_swapchain != NULL); KVF_ASSERT(kvf_swapchain->images_count != 0); - return kvfBuildAttachmentDescription(KVF_IMAGE_COLOR, kvf_swapchain->images_format, VK_IMAGE_LAYOUT_UNDEFINED,VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, clear, VK_SAMPLE_COUNT_1_BIT); + return kvfBuildAttachmentDescription(KVF_IMAGE_COLOR, kvf_swapchain->images_format, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, clear, VK_SAMPLE_COUNT_1_BIT); } #endif