pke: handle pk.h breaking changes

1 files changed, 59 insertions, 59 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 1b3a91c..7a86b26 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -659,7 +659,7 @@ unsigned int FindQueueFamilyIndex(VkPhysicalDevice device, char hasPresentSuppor
 
 	unsigned int queueFamilyPropertyCount = 0U;
 	vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyPropertyCount, nullptr);
-	auto *queueFamilyProperties = pk_new<VkQueueFamilyProperties>(queueFamilyPropertyCount, pkeSettings.mem_bkt.game_transient);
+	auto *queueFamilyProperties = pk_new_arr<VkQueueFamilyProperties>(queueFamilyPropertyCount, pkeSettings.mem_bkt.game_transient);
 	vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyPropertyCount, queueFamilyProperties);
 
 	for (unsigned int i = 0; i < queueFamilyPropertyCount; i++) {
@@ -784,7 +784,7 @@ void InitVulkan() {
 		unsigned int layerCount;
 		vkResult = vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		VkLayerProperties *availableLayerProperties = pk_new<VkLayerProperties>(layerCount, pkeSettings.mem_bkt.game_transient);
+		VkLayerProperties *availableLayerProperties = pk_new_arr<VkLayerProperties>(layerCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateInstanceLayerProperties(&layerCount, availableLayerProperties);
 		assert(vkResult == VK_SUCCESS);
 		printf("Available Layers:\n");
@@ -860,7 +860,7 @@ void InitVulkan() {
 		unsigned int extensionCount = 0;
 		vkResult = vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		auto *extensions = pk_new<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
+		auto *extensions = pk_new_arr<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions);
 		assert(vkResult == VK_SUCCESS);
 		printf("Available Extensions:\n");
@@ -906,7 +906,7 @@ void InitVulkan() {
 	vkResult = vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, nullptr);
 	assert(vkResult == VK_SUCCESS);
 	assert(physicalDeviceCount > 0);
-	auto *physicalDevices = pk_new<VkPhysicalDevice>(physicalDeviceCount, pkeSettings.mem_bkt.game_transient);
+	auto *physicalDevices = pk_new_arr<VkPhysicalDevice>(physicalDeviceCount, pkeSettings.mem_bkt.game_transient);
 	vkResult = vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices);
 	assert(vkResult == VK_SUCCESS);
 	graphicsFamilyIndex = 0;
@@ -926,7 +926,7 @@ void InitVulkan() {
 		unsigned int extensionCount = 0;
 		vkResult = vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		auto *extensionProperties = pk_new<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
+		auto *extensionProperties = pk_new_arr<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, extensionProperties);
 		assert(vkResult == VK_SUCCESS);
 		for (long k = 0; k < extensionCount; ++k) {
@@ -1188,7 +1188,7 @@ void CreateSwapchain() {
 		unsigned int surfaceFormatCounts;
 		vkResult = vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		VkSurfaceFormatKHR *surfaceFormats = pk_new<VkSurfaceFormatKHR>(surfaceFormatCounts, pkeSettings.mem_bkt.game_transient);
+		VkSurfaceFormatKHR *surfaceFormats = pk_new_arr<VkSurfaceFormatKHR>(surfaceFormatCounts, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, surfaceFormats);
 		assert(vkResult == VK_SUCCESS);
 		selectedSurfaceIndex = 0;
@@ -1214,7 +1214,7 @@ void CreateSwapchain() {
 		unsigned int presentModeCount = 0;
 		vkResult = vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		VkPresentModeKHR *presentModes = pk_new<VkPresentModeKHR>(presentModeCount, pkeSettings.mem_bkt.game_transient);
+		VkPresentModeKHR *presentModes = pk_new_arr<VkPresentModeKHR>(presentModeCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, presentModes);
 		assert(vkResult == VK_SUCCESS);
 		vkPresentModeKHR = PickPresentMode(presentModes, presentModeCount);
@@ -1277,10 +1277,10 @@ void CreateSwapchain() {
 	assert(swapchainLength >= surfaceCapabilities.minImageCount);
 	assert(surfaceCapabilities.maxImageCount == 0 || swapchainLength <= surfaceCapabilities.maxImageCount);
 	if (prevSwapchainLength == 0) prevSwapchainLength = swapchainLength;
-	pkvk_present.images = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.images = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
 	vkResult = vkGetSwapchainImagesKHR(vkDevice, vkSwapchainKHR, &swapchainLength, pkvk_present.images);
 	assert(vkResult == VK_SUCCESS);
-	pkvk_present.image_views = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.image_views = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 
 	VkImageSubresourceRange vkImageSubresourceRange;
 	vkImageSubresourceRange.aspectMask = VkImageAspectFlagBits::VK_IMAGE_ASPECT_COLOR_BIT;
@@ -1330,18 +1330,18 @@ void CreateSwapchain() {
 	renderTargetImageCI.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 
 	// 3d color (fragment) images
-	pkvk_3d.render_images = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_3d.image_views = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_3d.render_images = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_3d.image_views = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_3d.render_images, pkvk_3d.image_views, &pkvk_3d.images_memory);
 
 	// 2d color (fragment) images
-	pkvk_2d.images = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_2d.image_views = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_2d.images = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_2d.image_views = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_2d.images, pkvk_2d.image_views, &pkvk_2d.images_memory);
 
 	// 2d glyph color (fragment) images
-	pkvk_glyph.images = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_glyph.image_views = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_glyph.images = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_glyph.image_views = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_glyph.images, pkvk_glyph.image_views, &pkvk_glyph.images_memory);
 
 	// resolve settings
@@ -1349,18 +1349,18 @@ void CreateSwapchain() {
 	renderTargetImageCI.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
 
 	// 3d color (resolve)
-	pkvk_3d.images_color_resolve = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_3d.image_views_color_resolve = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_3d.images_color_resolve = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_3d.image_views_color_resolve = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_3d.images_color_resolve, pkvk_3d.image_views_color_resolve, &pkvk_3d.images_memory_color_resolve);
 
 	// 2d color (resolve)
-	pkvk_2d.images_color_resolve = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_2d.image_views_color_resolve = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_2d.images_color_resolve = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_2d.image_views_color_resolve = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_2d.images_color_resolve, pkvk_2d.image_views_color_resolve, &pkvk_2d.images_memory_color_resolve);
 
 	// 2d glyph color (resolve)
-	pkvk_glyph.images_color_resolve = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	pkvk_glyph.image_views_color_resolve = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	pkvk_glyph.images_color_resolve = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	pkvk_glyph.image_views_color_resolve = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, pkvk_glyph.images_color_resolve, pkvk_glyph.image_views_color_resolve, &pkvk_glyph.images_memory_color_resolve);
 
 	// depth settings
@@ -1371,15 +1371,15 @@ void CreateSwapchain() {
 	vkImageViewCreateInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT;
 
 	// depth images
-	depthImages = pk_new<VkImage>(swapchainLength, MemBkt_Vulkan);
-	depthImageViews = pk_new<VkImageView>(swapchainLength, MemBkt_Vulkan);
+	depthImages = pk_new_arr<VkImage>(swapchainLength, MemBkt_Vulkan);
+	depthImageViews = pk_new_arr<VkImageView>(swapchainLength, MemBkt_Vulkan);
 	CreateImageResources_Inner(&renderTargetImageCI, &vkImageViewCreateInfo, VkBufferUsageFlagBits(0), nullptr, depthImages, depthImageViews, &depthImagesMemory);
 }
 
 void UpdatePresentDescriptorSets() {
 	const unsigned int sub_pass_count = 3;
-	VkWriteDescriptorSet *writeDescriptorSets = pk_new<VkWriteDescriptorSet>(swapchainLength * sub_pass_count, pkeSettings.mem_bkt.game_transient);
-	VkDescriptorImageInfo *descriptorImageInfo = pk_new<VkDescriptorImageInfo>(swapchainLength * sub_pass_count, pkeSettings.mem_bkt.game_transient);
+	VkWriteDescriptorSet *writeDescriptorSets = pk_new_arr<VkWriteDescriptorSet>(swapchainLength * sub_pass_count, pkeSettings.mem_bkt.game_transient);
+	VkDescriptorImageInfo *descriptorImageInfo = pk_new_arr<VkDescriptorImageInfo>(swapchainLength * sub_pass_count, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < swapchainLength * sub_pass_count; ++i) {
 		writeDescriptorSets[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
 		writeDescriptorSets[i].pNext = nullptr;
@@ -1624,7 +1624,7 @@ void CreatePresentPipeline() {
 	vkResult = vkCreateDescriptorPool(vkDevice, &descriptorPoolCreateInfo, vkAllocator, &pkvk_present.descriptor_pool);
 	assert(vkResult == VK_SUCCESS);
 
-	VkDescriptorSetLayout *setLayouts = pk_new<VkDescriptorSetLayout>(swapchainLength * 3, pkeSettings.mem_bkt.game_transient);
+	VkDescriptorSetLayout *setLayouts = pk_new_arr<VkDescriptorSetLayout>(swapchainLength * 3, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < swapchainLength * 3; ++i) {
 		setLayouts[i] = pkvk_present.descriptor_set_layout;
 	}
@@ -1635,7 +1635,7 @@ void CreatePresentPipeline() {
 	allocInfo.descriptorSetCount = swapchainLength * 3;
 	allocInfo.pSetLayouts = setLayouts;
 
-	pkvk_present.descriptor_sets = pk_new<VkDescriptorSet>(swapchainLength * 3, MemBkt_Vulkan);
+	pkvk_present.descriptor_sets = pk_new_arr<VkDescriptorSet>(swapchainLength * 3, MemBkt_Vulkan);
 	vkResult = vkAllocateDescriptorSets(vkDevice, &allocInfo, pkvk_present.descriptor_sets);
 	// setLayouts = CAFE_BABE(VkDescriptorSetLayout);
 	if (vkResult != VK_SUCCESS) {
@@ -1727,7 +1727,7 @@ void CreateCommandPool() {
 void DestroyPresentCommandBuffers() {
 	if (pkvk_present.command_buffers != nullptr) {
 		vkFreeCommandBuffers(vkDevice, pkvk_shared.command_pool.graphics, prevSwapchainLength, pkvk_present.command_buffers);
-		pk_delete<VkCommandBuffer>(pkvk_present.command_buffers, prevSwapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkCommandBuffer>(pkvk_present.command_buffers, prevSwapchainLength, MemBkt_Vulkan);
 		pkvk_present.command_buffers = nullptr;
 	}
 }
@@ -1742,7 +1742,7 @@ void CreatePresentCommandBuffers() {
 	allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
 	allocInfo.commandBufferCount = swapchainLength;
 
-	pkvk_present.command_buffers = pk_new<VkCommandBuffer>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.command_buffers = pk_new_arr<VkCommandBuffer>(swapchainLength, MemBkt_Vulkan);
 	auto result = vkAllocateCommandBuffers(vkDevice, &allocInfo, pkvk_present.command_buffers);
 	if (result != VK_SUCCESS) {
 		throw "failed to allocate command buffer";
@@ -1783,7 +1783,7 @@ void CreateUniformBuffers() {
 	vkBufferCreateInfo.queueFamilyIndexCount = graphicsFamilyIndex == transferFamilyIndex ? 1 : 2;
 	vkBufferCreateInfo.pQueueFamilyIndices = queueFamilyIndexes;
 
-	UniformBuffers = pk_new<VkBuffer>(swapchainLength, MemBkt_Vulkan);
+	UniformBuffers = pk_new_arr<VkBuffer>(swapchainLength, MemBkt_Vulkan);
 	result = vkCreateBuffer(vkDevice, &vkBufferCreateInfo, vkAllocator, &UniformBuffers[0]);
 	assert(result == VK_SUCCESS);
 
@@ -1825,9 +1825,9 @@ void CreateSyncObjects() {
 	fenceInfo.pNext = nullptr;
 	fenceInfo.flags = VK_FENCE_CREATE_SIGNALED_BIT;
 
-	pkvk_present.semaphores_image_available = pk_new<VkSemaphore>(swapchainLength, MemBkt_Vulkan);
-	pkvk_present.semaphores_render_finished = pk_new<VkSemaphore>(swapchainLength, MemBkt_Vulkan);
-	pkvk_present.fences_in_flight = pk_new<VkFence>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.semaphores_image_available = pk_new_arr<VkSemaphore>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.semaphores_render_finished = pk_new_arr<VkSemaphore>(swapchainLength, MemBkt_Vulkan);
+	pkvk_present.fences_in_flight = pk_new_arr<VkFence>(swapchainLength, MemBkt_Vulkan);
 	for (long i = 0; i < swapchainLength; ++i) {
 		auto result1 = vkCreateSemaphore(vkDevice, &semaphoreInfo, vkAllocator, &pkvk_present.semaphores_image_available[i]);
 		auto result2 = vkCreateSemaphore(vkDevice, &semaphoreInfo, vkAllocator, &pkvk_present.semaphores_render_finished[i]);
@@ -2832,7 +2832,7 @@ void CreateGraphicsPipelines() {
 void DestroyDebugDescriptors() {
 	if (pkeDebugHitbox.vkDescriptorPool != VK_NULL_HANDLE) {
 		vkDestroyDescriptorPool(vkDevice, pkeDebugHitbox.vkDescriptorPool, vkAllocator);
-		pk_delete<VkDescriptorSet>(pkeDebugHitbox.vkDescriptorSets, prevSwapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkDescriptorSet>(pkeDebugHitbox.vkDescriptorSets, prevSwapchainLength, MemBkt_Vulkan);
 		pkeDebugHitbox.vkDescriptorPool = VK_NULL_HANDLE;
 		pkeDebugHitbox.vkDescriptorSets = nullptr;
 	}
@@ -2861,7 +2861,7 @@ void CreateDebugDescriptors() {
 	auto vkResult = vkCreateDescriptorPool(vkDevice, &vkDescriptorPoolCreateInfo, vkAllocator, &pkeDebugHitbox.vkDescriptorPool);
 	assert(vkResult == VK_SUCCESS);
 
-	VkDescriptorSetLayout *descriptorSets = pk_new<VkDescriptorSetLayout>(swapchainLength, pkeSettings.mem_bkt.game_transient);
+	VkDescriptorSetLayout *descriptorSets = pk_new_arr<VkDescriptorSetLayout>(swapchainLength, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < swapchainLength; ++i) {
 		descriptorSets[i] = pkePipelines.descr_layouts.named.ubo_txtr;
 	}
@@ -2872,7 +2872,7 @@ void CreateDebugDescriptors() {
 	vkDescriptorSetAllocateInfo.descriptorSetCount = swapchainLength;
 	vkDescriptorSetAllocateInfo.pSetLayouts = descriptorSets;
 
-	pkeDebugHitbox.vkDescriptorSets = pk_new<VkDescriptorSet>(swapchainLength, MemBkt_Vulkan);
+	pkeDebugHitbox.vkDescriptorSets = pk_new_arr<VkDescriptorSet>(swapchainLength, MemBkt_Vulkan);
 	for (long i = 0; i < swapchainLength; ++i) {
 		pkeDebugHitbox.vkDescriptorSets[i] = VkDescriptorSet{};
 	}
@@ -2882,7 +2882,7 @@ void CreateDebugDescriptors() {
 }
 
 void UpdateDebugDescriptors() {
-	VkWriteDescriptorSet *writeDescriptorSets = pk_new<VkWriteDescriptorSet>(2 * swapchainLength, pkeSettings.mem_bkt.game_transient);
+	VkWriteDescriptorSet *writeDescriptorSets = pk_new_arr<VkWriteDescriptorSet>(2 * swapchainLength, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < 2 * swapchainLength; ++i) {
 		writeDescriptorSets[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
 		writeDescriptorSets[i].pNext = nullptr;
@@ -2902,7 +2902,7 @@ void UpdateDebugDescriptors() {
 	textureDescriptorInfo.imageView = pkeDebugHitbox.vkImageView;
 	textureDescriptorInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
-	VkDescriptorBufferInfo *vkDescriptorBufferInfo = pk_new<VkDescriptorBufferInfo>(swapchainLength, pkeSettings.mem_bkt.game_transient);
+	VkDescriptorBufferInfo *vkDescriptorBufferInfo = pk_new_arr<VkDescriptorBufferInfo>(swapchainLength, pkeSettings.mem_bkt.game_transient);
 
 	for (long i = 0; i < swapchainLength; ++i) {
 		vkDescriptorBufferInfo[i].buffer = UniformBuffers[i];
@@ -3486,13 +3486,13 @@ void DestroySyncObjects() {
 		}
 	}
 
-	pk_delete<VkSemaphore>(pkvk_present.semaphores_image_available, prevSwapchainLength, MemBkt_Vulkan);
+	pk_delete_arr<VkSemaphore>(pkvk_present.semaphores_image_available, prevSwapchainLength, MemBkt_Vulkan);
 	pkvk_present.semaphores_image_available = CAFE_BABE(VkSemaphore);
 
-	pk_delete<VkSemaphore>(pkvk_present.semaphores_render_finished, prevSwapchainLength, MemBkt_Vulkan);
+	pk_delete_arr<VkSemaphore>(pkvk_present.semaphores_render_finished, prevSwapchainLength, MemBkt_Vulkan);
 	pkvk_present.semaphores_render_finished = CAFE_BABE(VkSemaphore);
 
-	pk_delete<VkFence>(pkvk_present.fences_in_flight, prevSwapchainLength, MemBkt_Vulkan);
+	pk_delete_arr<VkFence>(pkvk_present.fences_in_flight, prevSwapchainLength, MemBkt_Vulkan);
 	pkvk_present.fences_in_flight = CAFE_BABE(VkFence);
 }
 
@@ -3509,7 +3509,7 @@ void DestroyPresentPipeline() {
 
 	if (pkvk_present.descriptor_sets != nullptr && pkvk_present.descriptor_sets != CAFE_BABE(VkDescriptorSet)) {
 		vkFreeDescriptorSets(vkDevice, pkvk_present.descriptor_pool, prevSwapchainLength * 3, pkvk_present.descriptor_sets);
-		pk_delete<VkDescriptorSet>(pkvk_present.descriptor_sets, prevSwapchainLength * 3, MemBkt_Vulkan);
+		pk_delete_arr<VkDescriptorSet>(pkvk_present.descriptor_sets, prevSwapchainLength * 3, MemBkt_Vulkan);
 		pkvk_present.descriptor_sets = CAFE_BABE(VkDescriptorSet);
 	}
 
@@ -3525,9 +3525,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, depthImageViews[i], vkAllocator);
 			vkDestroyImage(vkDevice, depthImages[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(depthImageViews, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(depthImageViews, swapchainLength, MemBkt_Vulkan);
 		depthImageViews = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(depthImages, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(depthImages, swapchainLength, MemBkt_Vulkan);
 		depthImages = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, depthImagesMemory, vkAllocator);
 	}
@@ -3536,9 +3536,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_glyph.image_views[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_glyph.images[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_glyph.image_views, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_glyph.image_views, swapchainLength, MemBkt_Vulkan);
 		pkvk_glyph.image_views = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_glyph.images, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_glyph.images, swapchainLength, MemBkt_Vulkan);
 		pkvk_glyph.images = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, pkvk_glyph.images_memory, vkAllocator);
 	}
@@ -3547,9 +3547,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_glyph.image_views_color_resolve[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_glyph.images_color_resolve[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_glyph.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_glyph.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_glyph.image_views_color_resolve = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_glyph.images_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_glyph.images_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_glyph.images_color_resolve = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, pkvk_glyph.images_memory_color_resolve, vkAllocator);
 	}
@@ -3558,9 +3558,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_2d.image_views[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_2d.images[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_2d.image_views, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_2d.image_views, swapchainLength, MemBkt_Vulkan);
 		pkvk_2d.image_views = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_2d.images, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_2d.images, swapchainLength, MemBkt_Vulkan);
 		pkvk_2d.images = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, pkvk_2d.images_memory, vkAllocator);
 	}
@@ -3569,9 +3569,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_2d.image_views_color_resolve[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_2d.images_color_resolve[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_2d.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_2d.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_2d.image_views_color_resolve = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_2d.images_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_2d.images_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_2d.images_color_resolve = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, pkvk_2d.images_memory_color_resolve, vkAllocator);
 	}
@@ -3580,10 +3580,10 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_3d.image_views_color_resolve[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_3d.images_color_resolve[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_3d.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_3d.image_views_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_3d.image_views_color_resolve = CAFE_BABE(VkImageView);
 		vkFreeMemory(vkDevice, pkvk_3d.images_memory_color_resolve, vkAllocator);
-		pk_delete<VkImage>(pkvk_3d.images_color_resolve, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_3d.images_color_resolve, swapchainLength, MemBkt_Vulkan);
 		pkvk_3d.images_color_resolve = CAFE_BABE(VkImage);
 	}
 	if (pkvk_3d.image_views != nullptr && pkvk_3d.image_views != CAFE_BABE(VkImageView)) {
@@ -3591,9 +3591,9 @@ void DestroySwapchain() {
 			vkDestroyImageView(vkDevice, pkvk_3d.image_views[i], vkAllocator);
 			vkDestroyImage(vkDevice, pkvk_3d.render_images[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_3d.image_views, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_3d.image_views, swapchainLength, MemBkt_Vulkan);
 		pkvk_3d.image_views = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_3d.render_images, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_3d.render_images, swapchainLength, MemBkt_Vulkan);
 		pkvk_3d.render_images = CAFE_BABE(VkImage);
 		vkFreeMemory(vkDevice, pkvk_3d.images_memory, vkAllocator);
 	}
@@ -3601,9 +3601,9 @@ void DestroySwapchain() {
 		for (long i = 0; i < swapchainLength; ++i) {
 			vkDestroyImageView(vkDevice, pkvk_present.image_views[i], vkAllocator);
 		}
-		pk_delete<VkImageView>(pkvk_present.image_views, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImageView>(pkvk_present.image_views, swapchainLength, MemBkt_Vulkan);
 		pkvk_present.image_views = CAFE_BABE(VkImageView);
-		pk_delete<VkImage>(pkvk_present.images, swapchainLength, MemBkt_Vulkan);
+		pk_delete_arr<VkImage>(pkvk_present.images, swapchainLength, MemBkt_Vulkan);
 		pkvk_present.images = CAFE_BABE(VkImage);
 		// no memory free for present because they are managed by the swapchain
 	}
@@ -3618,7 +3618,7 @@ void DestroyUniformBuffers() {
 		}
 	}
 
-	pk_delete<VkBuffer>(UniformBuffers, prevSwapchainLength, MemBkt_Vulkan);
+	pk_delete_arr<VkBuffer>(UniformBuffers, prevSwapchainLength, MemBkt_Vulkan);
 	UniformBuffers = CAFE_BABE(VkBuffer);
 
 	vkFreeMemory(vkDevice, uniformBufferMemory, vkAllocator);