X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvulkan%2Fvk.cc;h=654165be411025b83915710d973621be8f9734ee;hb=dbce2a319517c09fcf1a9be60ae46a0ff20c423e;hp=9297e6358326d30907cc7f4c6784c8c84e4e2131;hpb=9d97500df375665ce6757c1341373cdd34fd9235;p=demo

diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc
index 9297e63..654165b 100644
--- a/src/vulkan/vk.cc
+++ b/src/vulkan/vk.cc
@@ -32,16 +32,12 @@ static const VkFormat dformat = VK_FORMAT_D32_SFLOAT_S8_UINT;
 static VkImage *images;
 static VkImageView *iviews;
 static uint32_t num_images;
-//renderpass
-static VkRenderPass rpass;
 static VkFramebuffer fbs[2];
 //semaphores-drawing-presentation
 static uint32_t curr_img; // current sc image
 static VkSemaphore psema;
 
-
 /* static variables */
-static VkDeviceMemory gpu_mem; // to be replaced when I fix the allocator
 static Vec4 clear_color(1, 0.1, 0.1, 1.0);
 
 /* static functions */
@@ -56,10 +52,10 @@ static void begin_drawing();
 static void end_drawing();
 
 static bool create_swapchain(VkSwapchainKHR *sc);
-static bool begin_init_command_buffer(VkCommandBuffer *cb);
 static bool create_zbuffer();
 static bool create_renderpass();
-static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views);
+static bool create_framebuffers();
+static bool begin_init_command_buffer(VkCommandBuffer *cb);
 static bool end_init_command_buffer(VkCommandBuffer *cb);
 static bool allocate_rendering_command_buffers(VkCommandBuffer *bufs);
 static void free_rendering_command_buffers(VkCommandBuffer *bufs, int count);
@@ -86,7 +82,7 @@ bool init_vulkan()
 		return false;
 	}
 
-	if(!glfwGetPhysicalDevicePresentationSupport(vkinst, vk_physical, vkqfamily)) {
+	if(!glfwGetPhysicalDevicePresentationSupport(vk_instance, vk_physical, vk_qfamily)) {
 		fprintf(stderr, "Presentation support not found.\n");
 		return false;
 	}
@@ -97,7 +93,7 @@ bool init_vulkan()
 		return false;
 	}
 
-	VkResult res = glfwCreateWindowSurface(vkinst, win, 0, &vk_surface);
+	VkResult res = glfwCreateWindowSurface(vk_instance, win, 0, &vk_surface);
 	if(res != VK_SUCCESS) {
 		fprintf(stderr, "Failed to create KHR surface: %s\n", vku_get_vulkan_error_str(res));
 		return false;
@@ -124,7 +120,7 @@ bool init_vulkan()
 		return false;
 	}
 
-	if(!create_framebuffers(fbs, iviews)) {
+	if(!create_framebuffers()) {
 		fprintf(stderr, "Failed to create the framebuffer.\n");
 		return false;
 	}
@@ -348,12 +344,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,
@@ -434,15 +431,15 @@ static bool create_renderpass()
 	rinf.subpassCount = 1;
 	rinf.pSubpasses = &sd;
 
-	if(vkCreateRenderPass(vk_device, &rinf, 0, &rpass) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to create rpass.\n");
+	if(vkCreateRenderPass(vk_device, &rinf, 0, &vk_renderpass) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create render pass.\n");
 		return false;
 	}
 
 	return true;
 }
 
-static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
+static bool create_framebuffers()
 {
 	/* framebuffer attachments */
 	VkImageView fb_att[2];
@@ -451,7 +448,7 @@ static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
 	VkFramebufferCreateInfo fbinf;
 	memset(&fbinf, 0, sizeof fbinf);
 	fbinf.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	fbinf.renderPass = rpass;
+	fbinf.renderPass = vk_renderpass;
 	fbinf.attachmentCount = 2;
 	fbinf.pAttachments = fb_att;
 	fbinf.width = win_w;
@@ -459,8 +456,8 @@ static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
 	fbinf.layers = 1;
 
 	for(int i=0; i<2; i++) {
-		fb_att[0] = views[i];
-		if(vkCreateFramebuffer(vk_device, &fbinf, 0, &fb[i]) != VK_SUCCESS) {
+		fb_att[0] = iviews[i];
+		if(vkCreateFramebuffer(vk_device, &fbinf, 0, &fbs[i]) != VK_SUCCESS) {
 			fprintf(stderr, "Failed to create framebuffer %i\n", i);
 			return false;
 		}
@@ -552,7 +549,7 @@ static bool begin_rendering_command_buffers(VkCommandBuffer *bufs, int count)
 		VkRenderPassBeginInfo rbinf;
 		memset(&rbinf, 0, sizeof rbinf);
 		rbinf.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
-		rbinf.renderPass = rpass;
+		rbinf.renderPass = vk_renderpass;
 		rbinf.framebuffer = fbs[i];
 		rbinf.renderArea.extent.width = win_w;
 		rbinf.renderArea.extent.height = win_h;
@@ -599,7 +596,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);
@@ -618,17 +614,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)