Slendi/lunar
1
0
Fork 0
mirror of https://github.com/slendidev/lunar.git synced 2025-12-14 11:49:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash

Browse Source 
Signed-off-by: Slendi <slendi@socopon.com>
This commit is contained in:
Slendi
2025-12-11 13:06:42 +02:00
parent 872ce63358
commit a1061c873a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/VulkanRenderer.cpp
View File

@@ -1132,16 +1132,13 @@ auto VulkanRenderer::create_image(void const *data, VkExtent3D size,
vmaGetAllocationInfo(m_vk.allocator, upload_buffer.allocation, &info); vmaGetAllocationInfo(m_vk.allocator, upload_buffer.allocation, &info);
void *mapped_data { reinterpret_cast<GPUSceneData *>(info.pMappedData) }; void *mapped_data { reinterpret_cast<GPUSceneData *>(info.pMappedData) };
bool mapped_here { false };
if (!mapped_data) { if (!mapped_data) {
VkResult res = vmaMapMemory( VkResult res = vmaMapMemory(
m_vk.allocator, upload_buffer.allocation, (void **)&mapped_data); m_vk.allocator, upload_buffer.allocation, (void **)&mapped_data);
assert(res == VK_SUCCESS); assert(res == VK_SUCCESS);
mapped_here = true;
} }
defer({
if (info.pMappedData == nullptr) {
vmaUnmapMemory(m_vk.allocator, upload_buffer.allocation);
}
});
memcpy(mapped_data, data, data_size); memcpy(mapped_data, data, data_size);
@@ -1175,6 +1172,9 @@ auto VulkanRenderer::create_image(void const *data, VkExtent3D size,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL); VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
}); });
if (mapped_here) {
vmaUnmapMemory(m_vk.allocator, upload_buffer.allocation);
}
destroy_buffer(upload_buffer); destroy_buffer(upload_buffer);
return new_image; return new_image;
@@ -1249,15 +1249,12 @@ auto VulkanRenderer::upload_mesh(
vmaGetAllocationInfo(m_vk.allocator, staging.allocation, &info); vmaGetAllocationInfo(m_vk.allocator, staging.allocation, &info);
void *data = info.pMappedData; void *data = info.pMappedData;
bool mapped_here { false };
if (!data) { if (!data) {
VkResult res = vmaMapMemory(m_vk.allocator, staging.allocation, &data); VkResult res = vmaMapMemory(m_vk.allocator, staging.allocation, &data);
assert(res == VK_SUCCESS); assert(res == VK_SUCCESS);
mapped_here = true;
} }
defer({
if (info.pMappedData == nullptr) {
vmaUnmapMemory(m_vk.allocator, staging.allocation);
}
});
memcpy(data, vertices.data(), vertex_buffer_size); memcpy(data, vertices.data(), vertex_buffer_size);
memcpy(reinterpret_cast<void *>( memcpy(reinterpret_cast<void *>(
@@ -1282,6 +1279,9 @@ auto VulkanRenderer::upload_mesh(
&index_copy); &index_copy);
}); });
if (mapped_here) {
vmaUnmapMemory(m_vk.allocator, staging.allocation);
}
destroy_buffer(staging); destroy_buffer(staging);
return new_surface; return new_surface;

2
thirdparty/smath vendored

Submodule thirdparty/smath updated: a5d669235e...1a42238a41