diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2025-06-05 10:50:24 -0400 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2025-06-05 10:50:24 -0400 |
| commit | 55c518b2922a2d8a41212a952a68c17c7c9a3f8b (patch) | |
| tree | 31cc135bc18bf11893d5ca3bca47c9ee27bf141f /src/entities.cpp | |
| parent | b0b1159780311c7c8ca9a9d41d11794e91e8895c (diff) | |
pk.h: update to 0.6.0 + handle breaking changes
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 eba48d5..dc54cdf 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -30,7 +30,7 @@ struct EntToTeardown { pk_arr_t<EntToTeardown> EntityTypesToTeardown{}; void EntityType_Init() { - new (&et_mstr.bc) pk_bkt_arr_t<EntityType>; + new (&et_mstr.bc) pk_bkt_arr_t<EntityType>{ pk_bkt_arr_handle_MAX_constexpr }; pk_arr_reserve(&EntityTypesToTeardown, 16); } @@ -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); + VkDescriptorSetLayout *descriptorSets = pk_new<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); + VkWriteDescriptorSet *writeDescriptorSets = pk_new<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); + VkDescriptorBufferInfo *vkDescriptorBufferInfo = pk_new<VkDescriptorBufferInfo>(swapchainLength, pkeSettings.mem_bkt.game_transient); for (long i = 0; i < et->detailsCount; ++i) { EntityTypeDetails *etd = &et->details[i]; @@ -1095,7 +1095,7 @@ void EntityType_Load(EntityType &et) { AssetHandle modelBinHandle = AM_Register(gltfPath.c_str(), PKE_ASSET_TYPE_UNSET); const Asset *modelBinAsset = AM_Get(modelBinHandle); - struct pk_membucket *entLoaderBkt = pk_bucket_create("entities", PK_DEFAULT_BUCKET_SIZE, false); + struct pk_membucket *entLoaderBkt = pk_mem_bucket_create("entities", PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE); EntityType_LoadHelperStruct helper { .bkt = entLoaderBkt, .et = et, @@ -1146,7 +1146,7 @@ void EntityType_Load(EntityType &et) { helper.instMemoryRequirements.bkt = nullptr; helper.physVertMemoryRequirements.bkt = nullptr; helper.textureMemoryRequirements.bkt = nullptr; - pk_bucket_destroy(helper.bkt); + pk_mem_bucket_destroy(entLoaderBkt); } void EntityType_Unload(EntityType &et, CompGrBinds *grBindsArr[1]) { |
