Fix misc crashes.

Themaister · Dec 11, 2023 · fc4f84d · fc4f84d
1 parent ba5c537
commit fc4f84d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/util/arena_allocator.cpp b/util/arena_allocator.cpp
@@ -146,7 +146,7 @@ void SliceAllocator::free(const Util::AllocatedSlice &slice)
 {
 	if (slice.alloc)
 		slice.alloc->free(slice.heap, slice.mask);
-	else
+	else if (slice.buffer_index != UINT32_MAX)
 		global_allocator->free(slice.buffer_index);
 }
 

diff --git a/util/arena_allocator.hpp b/util/arena_allocator.hpp
@@ -279,7 +279,7 @@ struct SliceSubAllocator;
 
 struct AllocatedSlice
 {
-	uint32_t buffer_index = 0;
+	uint32_t buffer_index = UINT32_MAX;
 	uint32_t offset = 0;
 	uint32_t count = 0;
 	uint32_t mask = 0;

diff --git a/vulkan/managers/resource_manager.cpp b/vulkan/managers/resource_manager.cpp
@@ -786,7 +786,7 @@ void MeshGlobalAllocator::free(uint32_t index)
 	VK_ASSERT(index < global_buffers.size());
 	for (uint32_t i = 0; i < soa_count; i++)
 	{
-		std::swap(preallocated[i], global_buffers[index + 1]);
+		std::swap(preallocated[i], global_buffers[index + i]);
 		global_buffers[index + i].reset();
 	}
 }