diff options
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 6fc56a8..33d9bb7 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -189,7 +189,7 @@ void EntityType_Inner_DestroyDescriptors(EntityType *et) { // If we switch to a global pool, we will need to free here, and // destroy the pool outside of this loop vkDestroyDescriptorPool(vkDevice, et->details[k].vkDescriptorPool, vkAllocator); - pk_delete<VkDescriptorSet>(et->details[k].grBinds->vkDescriptorSets, prevSwapchainLength, MemBkt_Vulkan); + pk_delete_arr<VkDescriptorSet>(et->details[k].grBinds->vkDescriptorSets, prevSwapchainLength, MemBkt_Vulkan); et->details[k].grBinds->vkDescriptorSets = CAFE_BABE(VkDescriptorSet); } } @@ -211,7 +211,7 @@ void EntityType_Inner_UpdateDescriptorSets(EntityType *et) { vkDescriptorPoolCreateInfo.poolSizeCount = (uint32_t)2; vkDescriptorPoolCreateInfo.pPoolSizes = descriptorPoolSizes; - 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; } @@ -222,7 +222,7 @@ void EntityType_Inner_UpdateDescriptorSets(EntityType *et) { vkDescriptorSetAllocateInfo.descriptorSetCount = swapchainLength; vkDescriptorSetAllocateInfo.pSetLayouts = descriptorSets; - 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; @@ -241,7 +241,7 @@ void EntityType_Inner_UpdateDescriptorSets(EntityType *et) { textureDescriptorInfo.sampler = global_sampler; 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 < et->detailsCount; ++i) { EntityTypeDetails *etd = &et->details[i]; @@ -251,7 +251,7 @@ void EntityType_Inner_UpdateDescriptorSets(EntityType *et) { vkDescriptorSetAllocateInfo.descriptorPool = etd->vkDescriptorPool; - etd->grBinds->vkDescriptorSets = pk_new<VkDescriptorSet>(swapchainLength, MemBkt_Vulkan); + etd->grBinds->vkDescriptorSets = pk_new_arr<VkDescriptorSet>(swapchainLength, MemBkt_Vulkan); for (long i = 0; i < swapchainLength; ++i) { etd->grBinds->vkDescriptorSets[i] = VkDescriptorSet{}; } @@ -1257,7 +1257,7 @@ void EntityType_Unload(EntityType &et, CompGrBinds *grBindsArr[1]) { et.deviceMemoryTexture = VK_NULL_HANDLE; if (et.entityTypeCode.reserved != 0) - pk_delete<char>(et.entityTypeCode.val, et.entityTypeCode.reserved); + pk_delete_arr<char>(et.entityTypeCode.val, et.entityTypeCode.reserved); et.entityTypeCode.val = CAFE_BABE(char); et.entityTypeCode.length = 0; et.entityTypeCode.reserved = 0; |