pk.h: update to 0.6.0 + handle breaking changes

1 files changed, 16 insertions, 16 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 6753cfa..dd871f6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -289,7 +289,7 @@ void pkvk_buffer_create(pkvk_buffer_create_data *data, pkvk_buffer_create_data_o
 	memset(&arr_vert_mem_reqs, 0, sizeof(pk_arr));
 	arr_vert_mem_reqs.alignment = alignof(VkMemoryRequirements);
 	arr_vert_mem_reqs.stride = sizeof(VkMemoryRequirements);
-	arr_vert_mem_reqs.bkt = pkeSettings.mem.bkt;
+	arr_vert_mem_reqs.bkt = pkeSettings.mem_bkt.game_transient;
 
 	/*
 	 * buffer setup
@@ -636,7 +636,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);
+	auto *queueFamilyProperties = pk_new<VkQueueFamilyProperties>(queueFamilyPropertyCount, pkeSettings.mem_bkt.game_transient);
 	vkGetPhysicalDeviceQueueFamilyProperties(device, &queueFamilyPropertyCount, queueFamilyProperties);
 
 	for (unsigned int i = 0; i < queueFamilyPropertyCount; i++) {
@@ -761,7 +761,7 @@ void InitVulkan() {
 		unsigned int layerCount;
 		vkResult = vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
 		assert(vkResult == VK_SUCCESS);
-		VkLayerProperties *availableLayerProperties = pk_new<VkLayerProperties>(layerCount, pkeSettings.mem.bkt);
+		VkLayerProperties *availableLayerProperties = pk_new<VkLayerProperties>(layerCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateInstanceLayerProperties(&layerCount, availableLayerProperties);
 		assert(vkResult == VK_SUCCESS);
 		printf("Available Layers:\n");
@@ -837,7 +837,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);
+		auto *extensions = pk_new<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions);
 		assert(vkResult == VK_SUCCESS);
 		printf("Available Extensions:\n");
@@ -883,7 +883,7 @@ void InitVulkan() {
 	vkResult = vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, nullptr);
 	assert(vkResult == VK_SUCCESS);
 	assert(physicalDeviceCount > 0);
-	auto *physicalDevices = pk_new<VkPhysicalDevice>(physicalDeviceCount, pkeSettings.mem.bkt);
+	auto *physicalDevices = pk_new<VkPhysicalDevice>(physicalDeviceCount, pkeSettings.mem_bkt.game_transient);
 	vkResult = vkEnumeratePhysicalDevices(vkInstance, &physicalDeviceCount, physicalDevices);
 	assert(vkResult == VK_SUCCESS);
 	graphicsFamilyIndex = 0;
@@ -903,7 +903,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);
+		auto *extensionProperties = pk_new<VkExtensionProperties>(extensionCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkEnumerateDeviceExtensionProperties(device, nullptr, &extensionCount, extensionProperties);
 		assert(vkResult == VK_SUCCESS);
 		for (long k = 0; k < extensionCount; ++k) {
@@ -1160,7 +1160,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);
+		VkSurfaceFormatKHR *surfaceFormats = pk_new<VkSurfaceFormatKHR>(surfaceFormatCounts, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkGetPhysicalDeviceSurfaceFormatsKHR(vkPhysicalDevice, vkSurfaceKHR, &surfaceFormatCounts, surfaceFormats);
 		assert(vkResult == VK_SUCCESS);
 		selectedSurfaceIndex = 0;
@@ -1186,7 +1186,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);
+		VkPresentModeKHR *presentModes = pk_new<VkPresentModeKHR>(presentModeCount, pkeSettings.mem_bkt.game_transient);
 		vkResult = vkGetPhysicalDeviceSurfacePresentModesKHR(vkPhysicalDevice, vkSurfaceKHR, &presentModeCount, presentModes);
 		assert(vkResult == VK_SUCCESS);
 		vkPresentModeKHR = PickPresentMode(presentModes, presentModeCount);
@@ -1335,8 +1335,8 @@ void CreateSwapchain() {
 }
 
 void UpdatePresentDescriptorSets() {
-	VkWriteDescriptorSet *writeDescriptorSets = pk_new<VkWriteDescriptorSet>(swapchainLength * 2, pkeSettings.mem.bkt);
-	VkDescriptorImageInfo *descriptorImageInfo = pk_new<VkDescriptorImageInfo>(swapchainLength * 2, pkeSettings.mem.bkt);
+	VkWriteDescriptorSet *writeDescriptorSets = pk_new<VkWriteDescriptorSet>(swapchainLength * 2, pkeSettings.mem_bkt.game_transient);
+	VkDescriptorImageInfo *descriptorImageInfo = pk_new<VkDescriptorImageInfo>(swapchainLength * 2, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < swapchainLength * 2; ++i) {
 		writeDescriptorSets[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
 		writeDescriptorSets[i].pNext = nullptr;
@@ -1725,7 +1725,7 @@ void CreatePresentPipeline() {
 	vkResult = vkCreateDescriptorPool(vkDevice, &descriptorPoolCreateInfo, vkAllocator, &pkvk_present.descriptor_pool);
 	assert(vkResult == VK_SUCCESS);
 
-	VkDescriptorSetLayout *setLayouts = pk_new<VkDescriptorSetLayout>(swapchainLength * 2, pkeSettings.mem.bkt);
+	VkDescriptorSetLayout *setLayouts = pk_new<VkDescriptorSetLayout>(swapchainLength * 2, pkeSettings.mem_bkt.game_transient);
 	for (long i = 0; i < swapchainLength * 2; ++i) {
 		setLayouts[i] = pkvk_present.descriptor_set_layout;
 	}
@@ -2973,7 +2973,7 @@ void CreateDebugDescriptors() {
 	auto vkResult = vkCreateDescriptorPool(vkDevice, &vkDescriptorPoolCreateInfo, vkAllocator, &pkeDebugHitbox.vkDescriptorPool);
 	assert(vkResult == VK_SUCCESS);
 
-	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;
 	}
@@ -2994,7 +2994,7 @@ void CreateDebugDescriptors() {
 }
 
 void UpdateDebugDescriptors() {
-	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;
@@ -3014,7 +3014,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);
+	VkDescriptorBufferInfo *vkDescriptorBufferInfo = pk_new<VkDescriptorBufferInfo>(swapchainLength, pkeSettings.mem_bkt.game_transient);
 
 	for (long i = 0; i < swapchainLength; ++i) {
 		vkDescriptorBufferInfo[i].buffer = UniformBuffers[i];
@@ -3547,7 +3547,7 @@ void CreateWindow(PKEWindowProperties wp) {
 	if (vkInstance != nullptr) return;
 	pke_ev_mgr_id_window = pk_ev_create_mgr();
 	pke_ev_id_framebuffer_length_changed = pk_ev_register_ev(pke_ev_mgr_id_window, NULL);
-	MemBkt_Vulkan = pk_bucket_create("vulkan", PK_DEFAULT_BUCKET_SIZE, false);
+	MemBkt_Vulkan = pk_mem_bucket_create("vulkan", PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE);
 	vulkanAllocs.bkt = MemBkt_Vulkan;
 	pk_arr_reserve(&vulkanAllocs, 2048);
 	glfwInit();
@@ -3652,7 +3652,7 @@ void DestroyWindow() {
 	pk_arr_reset(&vulkanAllocs);
 	// TODO there's un-freed vulkan stuff in the bucket
 	// comment this out to see it in the debug printout
-	pk_bucket_destroy(MemBkt_Vulkan);
+	pk_mem_bucket_destroy(MemBkt_Vulkan);
 }
 
 VkShaderModule UploadShader(AssetHandle handle) {