X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fvulkan%2Fvk.cc;fp=src%2Fvulkan%2Fvk.cc;h=4a232113119c98ccf85a1e253ec3a8b6cb9b69cd;hp=a0f77514c47ed568dbf8793b9fde1ce1a7a9b8da;hb=d90ed8aef9e3547eee75ad793c352ee022d35050;hpb=855c42d8e50fff743fd7b1be5e91cb0db18def77

diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc
index a0f7751..4a23211 100644
--- a/src/vulkan/vk.cc
+++ b/src/vulkan/vk.cc
@@ -354,12 +354,13 @@ static bool create_zbuffer()
 	VkMemoryRequirements dmem_reqs;
 	vkGetImageMemoryRequirements(vk_device, dimg, &dmem_reqs);
 
-	gpu_mem = vk_allocate(dmem_reqs.size);
-
-	if(!gpu_mem)
+	DevMemBlock block;
+	if(!vku_allocate(dmem_reqs.size, &block)) {
+		fprintf(stderr, "Failed to allocate zbuffer image.\n");
 		return false;
+	}
 
-	vkBindImageMemory(vk_device, dimg, gpu_mem, 0);
+	vkBindImageMemory(vk_device, dimg, block.dev_mem, 0);
 
 	if(!vk_image_set_layout(init_buf, dimg, VK_IMAGE_ASPECT_DEPTH_BIT,
 	                        VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
@@ -656,7 +657,6 @@ static bool begin_rendering_command_buffers(VkCommandBuffer *bufs, int count)
 
 void cleanup_vulkan()
 {
-	//TODO!!!
 	free_rendering_command_buffers(rbufs, 2);
 	if(win) {
 		glfwDestroyWindow(win);
@@ -675,17 +675,6 @@ static void error_callback(int error, const char *description)
 
 static void reshape(int width, int height)
 {
-//	VkSwapchainKHR sc;
-//	if(!(sc = vku_create_swapchain(vk_surface, width, height, 2, VK_PRESENT_MODE_FIFO_KHR,
-//	                               vk_swapchain))) {
-//		fprintf(stderr, "Failed to create %dx%d double-buffered swapchain\n", width, height);
-//		return;
-//	}
-//	vk_swapchain = sc;
-//
-//	delete [] vkswapchain_images;
-//	vkswapchain_images = vku_get_swapchain_images(sc, 0);
-//	vk_curr_swapchain_image = vku_get_next_image(vk_swapchain);
 }
 
 static void clear(float r, float g, float b)