X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fvulkan%2Fvk.cc;fp=src%2Fvulkan%2Fvk.cc;h=9297e6358326d30907cc7f4c6784c8c84e4e2131;hp=f5829ab13c53e95de8179357f3e2a5358cb973c4;hb=9d97500df375665ce6757c1341373cdd34fd9235;hpb=8fb0cca684e078cd2537070c53ad970ebbc2e9a7

diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc
index f5829ab..9297e63 100644
--- a/src/vulkan/vk.cc
+++ b/src/vulkan/vk.cc
@@ -21,20 +21,28 @@ extern GLFWwindow *win;
 extern int win_w;
 extern int win_h;
 
-static VkCommandBuffer cmd_buf; // command buffer used at zbuffer creation
+//command buffers
+static VkCommandBuffer init_buf;
+static VkCommandBuffer rbufs[2];
 //depth buffer
 static VkImage dimg;
 static VkImageView dview;
+static const VkFormat dformat = VK_FORMAT_D32_SFLOAT_S8_UINT;
 //swapchain
 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
-// zbuffer image, view:
-
-VkCommandBuffer *swapchain_cmd_bufs;
+static Vec4 clear_color(1, 0.1, 0.1, 1.0);
 
 /* static functions */
 static void error_callback(int error, const char *descr);
@@ -47,13 +55,15 @@ static void swapbuffers();
 static void begin_drawing();
 static void end_drawing();
 
-static bool create_swapchain();
-static bool begin_command_buffer();
-static bool create_swapchain_image_views(VkFormat format);
+static bool create_swapchain(VkSwapchainKHR *sc);
+static bool begin_init_command_buffer(VkCommandBuffer *cb);
 static bool create_zbuffer();
-
-static bool create_swapchain_cmd_bufs(VkCommandPool vk_pool);
-static bool record_cmd_clear(float r, float g, float b);
+static bool create_renderpass();
+static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views);
+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);
+static bool begin_rendering_command_buffers(VkCommandBuffer *bufs, int count);
 
 bool init_vulkan()
 {
@@ -93,13 +103,13 @@ bool init_vulkan()
 		return false;
 	}
 
-	if(!create_swapchain()) {
+	if(!create_swapchain(&vk_swapchain)) {
 		fprintf(stderr, "Failed to create swapchain.\n");
 		return false;
 	}
 
-	cmd_buf = VK_NULL_HANDLE;
-	if(!begin_command_buffer()) {
+	init_buf = VK_NULL_HANDLE;
+	if(!begin_init_command_buffer(&init_buf)) {
 		fprintf(stderr, "Failed to start VK_NULL_HANDLE command buffer.\n");
 		return false;
 	}
@@ -109,51 +119,45 @@ bool init_vulkan()
 		return false;
 	}
 
-	gfx_clear = clear;
-	gfx_viewport = viewport;
-	gfx_zbuffer = zbuffer;
-	gfx_cull_face = cull_face;
-	gfx_reshape = reshape;
-	gfx_swapbuffers = swapbuffers;
-	gfx_begin_drawing = begin_drawing;
-	gfx_end_drawing = end_drawing;
-
-
-/*
-	if(!vku_create_semaphores())
+	if(!create_renderpass()) {
+		fprintf(stderr, "Failed to create the renderpass.\n");
 		return false;
+	}
 
-	if(!(vk_swapchain = vku_create_swapchain(vk_surface, win_w, win_h, 2,
-	                                        VK_PRESENT_MODE_IMMEDIATE_KHR, 0))) {
-		fprintf(stderr, "Failed to create swapchain.\n");
+	if(!create_framebuffers(fbs, iviews)) {
+		fprintf(stderr, "Failed to create the framebuffer.\n");
 		return false;
 	}
 
-	vkswapchain_images = vku_get_swapchain_images(vk_swapchain, &vknum_swapchain_images);
-	if(!vkswapchain_images) {
-		fprintf(stderr, "Failed to get swapchain images.\n");
+	if(!end_init_command_buffer(&init_buf)) {
+		fprintf(stderr, "Failed to end the command buffer.\n");
 		return false;
 	}
 
-//		vkswapchain_views = vku_create_image_views(vkswapchain_images, vknum_swapchain_images);
-//		if(!vkswapchain_views) {
-//			fprintf(stderr, "Failed to create swapchain image views.\n");
-//			delete [] vkswapchain_images;
-//			return false;
-//		}
-
-	if(!create_swapchain_cmd_bufs(vk_pool)) {
+	/* rendering command buffers */
+	if(!allocate_rendering_command_buffers(rbufs)) {
+		fprintf(stderr, "Failed to allocate rendering command buffers.\n");
 		return false;
 	}
 
-	if(!record_cmd_clear(1.0, 0.1, 0.1))
+	if(!begin_rendering_command_buffers(rbufs, 2)) {
+		fprintf(stderr, "Failed to begin rendering command buffers.\n");
 		return false;
-	*/
+	}
+
+	gfx_clear = clear;
+	gfx_viewport = viewport;
+	gfx_zbuffer = zbuffer;
+	gfx_cull_face = cull_face;
+	gfx_reshape = reshape;
+	gfx_swapbuffers = swapbuffers;
+	gfx_begin_drawing = begin_drawing;
+	gfx_end_drawing = end_drawing;
 
 	return true;
 }
 
-static bool create_swapchain()
+static bool create_swapchain(VkSwapchainKHR *sc)
 {
 	/* surface capabilities */
 	VkSurfaceCapabilitiesKHR scap;
@@ -188,8 +192,8 @@ static bool create_swapchain()
 			break;
 		}
 		if((scmode != VK_PRESENT_MODE_MAILBOX_KHR) && (modes[i] == VK_PRESENT_MODE_IMMEDIATE_KHR)) {
-				//fallback
-				scmode = VK_PRESENT_MODE_IMMEDIATE_KHR;
+			//fallback
+			scmode = VK_PRESENT_MODE_IMMEDIATE_KHR;
 		}
 	}
 
@@ -214,36 +218,25 @@ static bool create_swapchain()
 	printf("num_images : %u\n", num_images);
 	assert(num_images > 0);
 
+	images = new VkImage[num_images];
+	iviews = new VkImageView[num_images];
+
 	/* transform flags */
 	VkSurfaceTransformFlagBitsKHR pre_transf = scap.currentTransform;
 	if(scap.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR)
 		pre_transf = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
 
 	/* find suitable colorspace, format */
-	uint32_t fcount;
-	if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, 0) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to get format count for physical device.\n");
-		return false;
-	}
-	if(fcount == 0) {
-		fprintf(stderr, "No color formats were found.\n");
-		return false;
-	}
-
 	VkFormat format;
 	VkColorSpaceKHR colorspace;
 
-	VkSurfaceFormatKHR *formats = new VkSurfaceFormatKHR[fcount];
-	if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, formats) != VK_SUCCESS) {
-		fprintf(stderr, "Failed to get surface formats.\n");
+	VkSurfaceFormatKHR sformat;
+	if(!vku_get_surface_format(vk_physical, vk_surface, &sformat)) {
 		return false;
 	}
-	if((fcount == 1) && (formats[0].format == VK_FORMAT_UNDEFINED)) {
-		format = VK_FORMAT_B8G8R8_UNORM;
-	} else {
-		format = formats[0].format;
-	}
-	colorspace = formats[0].colorSpace;
+
+	format = sformat.format;
+	colorspace = sformat.colorSpace;
 
 	/* creating the swapchain */
 	VkSwapchainCreateInfoKHR sinfo;
@@ -264,39 +257,23 @@ static bool create_swapchain()
 	sinfo.oldSwapchain = VK_NULL_HANDLE; //TODO
 	sinfo.clipped = VK_TRUE; //TODO
 
-	if(vkCreateSwapchainKHR(vk_device, &sinfo, 0, &vk_swapchain) != VK_SUCCESS) {
+	if(vkCreateSwapchainKHR(vk_device, &sinfo, 0, sc) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to create swapchain.\n");
 		return false;
 	}
 
-	if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, 0) != VK_SUCCESS) {
+	if(vkGetSwapchainImagesKHR(vk_device, *sc, &num_images, 0) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to get the number of the swapchain images.\n");
 		return false;
 	}
 
-	images = new VkImage[num_images];
-	if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, images) != VK_SUCCESS) {
+	if(vkGetSwapchainImagesKHR(vk_device, *sc, &num_images, images) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to get the swapchain images.\n");
 		return false;
 	}
-	assert(images);
 
-	if(!create_swapchain_image_views(format)) {
-		fprintf(stderr, "Failed to create image views for the swapchain images.\n");
-		return false;
-	}
-
-	// create renderpass
-
-
-	return true;
-}
-
-static bool create_swapchain_image_views(VkFormat format)
-{
 	VkImageViewCreateInfo ivinf;
 	memset(&ivinf, 0, sizeof ivinf);
-
 	ivinf.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
 	ivinf.format = format;
 	ivinf.components = {
@@ -310,21 +287,23 @@ static bool create_swapchain_image_views(VkFormat format)
 	ivinf.subresourceRange.layerCount = 1;
 	ivinf.viewType = VK_IMAGE_VIEW_TYPE_2D;
 
-	iviews = new VkImageView[num_images];
 	for(uint32_t i=0; i<num_images; i++) {
 		ivinf.image = images[i];
-		if(vkCreateImageView(vk_device, &ivinf, 0, &iviews[i]) != VK_SUCCESS) {
-			fprintf(stderr, "Failed to create view for the swapchain image: %d.\n", i);
+
+		VkResult res;
+		if((res = vkCreateImageView(vk_device, &ivinf, 0, &iviews[i])) != VK_SUCCESS) {
+			fprintf(stderr, "Failed to create image view %d: %s.\n", i, vku_get_vulkan_error_str(res));
 			return false;
 		}
 	}
+
 	return true;
 }
 
-static bool begin_command_buffer()
+static bool begin_init_command_buffer(VkCommandBuffer *cb)
 {
-	if(cmd_buf == VK_NULL_HANDLE) {
-		cmd_buf = vku_alloc_cmdbuf(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
+	if(*cb == VK_NULL_HANDLE) {
+		*cb = vku_alloc_cmdbuf(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
 
 		VkCommandBufferInheritanceInfo ciinf;
 		memset(&ciinf, 0, sizeof ciinf);
@@ -338,7 +317,7 @@ static bool begin_command_buffer()
 		cbinf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
 		cbinf.pInheritanceInfo = &ciinf;
 
-		if(vkBeginCommandBuffer(cmd_buf, &cbinf) != VK_SUCCESS) {
+		if(vkBeginCommandBuffer(*cb, &cbinf) != VK_SUCCESS) {
 			fprintf(stderr, "Failed to begin command buffer.\n");
 			return false;
 		}
@@ -348,15 +327,13 @@ static bool begin_command_buffer()
 
 static bool create_zbuffer()
 {
-	VkFormat dformat = VK_FORMAT_D32_SFLOAT_S8_UINT;
-
 	VkImageCreateInfo dinfo;
 	memset(&dinfo, 0, sizeof dinfo);
 
 	dinfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
 	dinfo.imageType = VK_IMAGE_TYPE_2D;
 	dinfo.format = dformat;
-	dinfo.extent = {win_w, win_h, 1};
+	dinfo.extent = {(uint32_t)win_w, (uint32_t)win_h, 1};
 	dinfo.mipLevels = 1;
 	dinfo.arrayLayers = 1;
 	dinfo.samples = VK_SAMPLE_COUNT_1_BIT;
@@ -378,10 +355,9 @@ static bool create_zbuffer()
 
 	vkBindImageMemory(vk_device, dimg, gpu_mem, 0);
 
-	// XXX set image layout
-	if(!vk_image_set_layout(cmd_buf, dimg, VK_IMAGE_ASPECT_DEPTH_BIT,
-			VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-			(VkAccessFlagBits)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,
+	                        (VkAccessFlagBits)0)) {
 		fprintf(stderr, "Failed to set depth buffer layout.\n");
 		return false;
 	}
@@ -399,14 +375,232 @@ static bool create_zbuffer()
 
 	if(vkCreateImageView(vk_device, &div_inf, 0, &dview) != VK_SUCCESS) {
 		fprintf(stderr, "Failed to create image view for depth buffer.\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool create_renderpass()
+{
+	VkSurfaceFormatKHR sformat;
+	if(!vku_get_surface_format(vk_physical, vk_surface, &sformat)) {
+		fprintf(stderr, "Failed to get surface format.\n");
+		return false;
+	}
+
+	VkAttachmentDescription att[2];
+	memset(&att, 0, (sizeof att[0]) * 2);
+
+	att[0].format = sformat.format;
+	att[0].samples = VK_SAMPLE_COUNT_1_BIT;
+	att[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	att[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	att[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	att[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	att[0].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+	att[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+	att[1].format = dformat;
+	att[1].samples = VK_SAMPLE_COUNT_1_BIT;
+	att[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	att[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	att[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+	att[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
+	att[1].initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+	att[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+	VkAttachmentReference cref;
+	memset(&cref, 0, sizeof cref);
+	cref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
+	VkAttachmentReference dref;
+	memset(&dref, 0, sizeof dref);
+	dref.attachment = 1;
+	dref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
+	VkSubpassDescription sd;
+	memset(&sd, 0, sizeof sd);
+	sd.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
+	sd.colorAttachmentCount = 1;
+	sd.pColorAttachments = &cref;
+	sd.pDepthStencilAttachment = &dref;
+
+	VkRenderPassCreateInfo rinf;
+	memset(&rinf, 0, sizeof rinf);
+	rinf.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
+	rinf.attachmentCount = 2;
+	rinf.pAttachments = att;
+	rinf.subpassCount = 1;
+	rinf.pSubpasses = &sd;
+
+	if(vkCreateRenderPass(vk_device, &rinf, 0, &rpass) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create rpass.\n");
+		return false;
+	}
+
+	return true;
+}
+
+static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
+{
+	/* framebuffer attachments */
+	VkImageView fb_att[2];
+	fb_att[1] = dview;
+
+	VkFramebufferCreateInfo fbinf;
+	memset(&fbinf, 0, sizeof fbinf);
+	fbinf.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
+	fbinf.renderPass = rpass;
+	fbinf.attachmentCount = 2;
+	fbinf.pAttachments = fb_att;
+	fbinf.width = win_w;
+	fbinf.height = win_h;
+	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) {
+			fprintf(stderr, "Failed to create framebuffer %i\n", i);
+			return false;
+		}
+	}
+	return true;
+}
+
+static bool end_init_command_buffer(VkCommandBuffer *cb)
+{
+	if(vkEndCommandBuffer(*cb) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to end command buffer.\n");
+		return false;
+	}
+
+	VkSubmitInfo si;
+	memset(&si, 0, sizeof si);
+	si.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+	si.commandBufferCount = 1;
+	si.pCommandBuffers = cb;
+
+	if(vkQueueSubmit(vk_queue, 1, &si, VK_NULL_HANDLE) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to submit null queue.\n");
+		return false;
+	}
+
+	if(vkQueueWaitIdle(vk_queue) != VK_SUCCESS) {
+		fprintf(stderr, "QueueWaitIdle failure!\n");
+		return false;
+	}
+
+	vkFreeCommandBuffers(vk_device, vk_pool, 1, cb);
+	*cb = VK_NULL_HANDLE;
+
+	return true;
+}
+
+static bool allocate_rendering_command_buffers(VkCommandBuffer *bufs)
+{
+	return vku_alloc_cmdbufs(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY,
+	                         2, bufs);
+}
+
+static void free_rendering_command_buffers(VkCommandBuffer *bufs, int count)
+{
+	for(int i=0; i<count; i++) {
+		vku_free_cmdbuf(vk_pool, bufs[i]);
 	}
+}
 
+static bool begin_rendering_command_buffers(VkCommandBuffer *bufs, int count)
+{
+	VkCommandBufferInheritanceInfo iinf;
+	memset(&iinf, 0, sizeof iinf);
+	iinf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
+	iinf.renderPass = VK_NULL_HANDLE;
+	iinf.framebuffer = VK_NULL_HANDLE;
+
+	VkCommandBufferBeginInfo binf;
+	memset(&binf, 0, sizeof binf);
+	binf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
+	binf.pInheritanceInfo = &iinf;
+
+	// setting clear values
+	VkClearValue clvals[2];
+	for(int i=0; i<4; i++) {
+		clvals[0].color.float32[i] = clear_color[i];
+	}
+	clvals[1].depthStencil = {1.0f, 0};
+
+	//build drawing command buffers
+	for(int i=0; i<count; i++) {
+		if(vkBeginCommandBuffer(bufs[i], &binf) != VK_SUCCESS) {
+			fprintf(stderr, "Failed to begin command buffer: %d\n", i);
+			return false;
+		}
+
+		VkImageMemoryBarrier imbarr;
+		memset(&imbarr, 0, sizeof imbarr);
+		imbarr.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		imbarr.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+		imbarr.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+		imbarr.newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+		imbarr.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		imbarr.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		imbarr.image = images[i];
+		imbarr.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
+		vkCmdPipelineBarrier(bufs[i], VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, 0, 0, 0, 1, &imbarr);
+
+		VkRenderPassBeginInfo rbinf;
+		memset(&rbinf, 0, sizeof rbinf);
+		rbinf.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
+		rbinf.renderPass = rpass;
+		rbinf.framebuffer = fbs[i];
+		rbinf.renderArea.extent.width = win_w;
+		rbinf.renderArea.extent.height = win_h;
+		rbinf.clearValueCount = count;
+		rbinf.pClearValues = clvals;
+
+		vkCmdBeginRenderPass(bufs[i], &rbinf, VK_SUBPASS_CONTENTS_INLINE);
+		VkViewport viewport;
+		memset(&viewport, 0, sizeof viewport);
+		viewport.width = (float)win_w;
+		viewport.height = (float)win_h;
+		viewport.maxDepth = 1.0f;
+		vkCmdSetViewport(bufs[i], 0, 1, &viewport);
+
+		VkRect2D scissor;
+		memset(&scissor, 0, sizeof scissor);
+		scissor.extent.width = win_w;
+		scissor.extent.height = win_h;
+		vkCmdSetScissor(bufs[i], 0, 1, &scissor);
+		vkCmdEndRenderPass(bufs[i]);
+
+		/* pre-present barrier */
+		VkImageMemoryBarrier ppb;
+		memset(&ppb, 0, sizeof ppb);
+		ppb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
+		ppb.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+		ppb.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
+		ppb.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+		ppb.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+		ppb.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		ppb.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
+		ppb.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1};
+		ppb.image = images[i];
+
+		vkCmdPipelineBarrier(bufs[i], VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, 0, 0, 0, 1, &ppb);
+
+		if(vkEndCommandBuffer(bufs[i]) != VK_SUCCESS) {
+			fprintf(stderr, "Failed to end command buffer: %d\n", i);
+			return false;
+		}
+	}
 	return true;
 }
 
 void cleanup_vulkan()
 {
-	vkFreeCommandBuffers(vk_device, vk_pool, vknum_swapchain_images, swapchain_cmd_bufs);
+	//TODO!!!
+	free_rendering_command_buffers(rbufs, 2);
 	if(win) {
 		glfwDestroyWindow(win);
 	}
@@ -424,17 +618,17 @@ 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);
+//	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)
@@ -459,129 +653,55 @@ static void swapbuffers()
 
 static void begin_drawing()
 {
-	// if((vk_curr_swapchain_image = vku_get_next_image(vk_swapchain)) == -1) {
-	// 	fprintf(stderr, "Failed to get swapchain image. Exiting.\n");
-	// 	exit(1);
-	// }
+	VkSemaphoreCreateInfo psinf;
+	memset(&psinf, 0, sizeof psinf);
+	psinf.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+
+	VkResult res;
+	if((res = vkCreateSemaphore(vk_device, &psinf, 0, &psema)) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create semaphore.\n");
+	}
+	assert(res == VK_SUCCESS);
 }
 
 static void end_drawing()
 {
-	/* submit queue */
-
-	// VkSubmitInfo sinf;
-	// memset(&sinf, 0, sizeof sinf);
-	// sinf.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
-	// sinf.waitSemaphoreCount = 1;
-	// sinf.pWaitSemaphores = &vk_img_avail_sema;
-	// sinf.signalSemaphoreCount = 1;
-	// sinf.pSignalSemaphores = &vk_rend_done_sema;
-
-	// // the queue should wait on the semaphore
-
-	// VkPipelineStageFlags wait_flags = VK_PIPELINE_STAGE_TRANSFER_BIT;
-	// sinf.pWaitDstStageMask = &wait_flags;
-	// sinf.commandBufferCount = 1;
-	// sinf.pCommandBuffers = &swapchain_cmd_bufs[vk_curr_swapchain_image];
-
-	// if(vkQueueSubmit(vk_queue, 1, &sinf, VK_NULL_HANDLE) != VK_SUCCESS) {
-	// 	fprintf(stderr, "Failed to submit drawing command buffer\n");
-	// 	exit(1);
-	// }
-
-	// /* present drawn image */
-	// VkPresentInfoKHR pinf;
-	// memset(&pinf, 0, sizeof pinf);
-	// pinf.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
-	// pinf.waitSemaphoreCount = 1;
-	// pinf.pWaitSemaphores = &vk_rend_done_sema;
-	// pinf.swapchainCount = 1;
-	// pinf.pSwapchains = &vk_swapchain;
-	// pinf.pImageIndices = (uint32_t *)&vk_curr_swapchain_image;
-
-	// if(vkQueuePresentKHR(vk_queue, &pinf) != VK_SUCCESS) {
-	// 	fprintf(stderr, "Failed to submit presentation command buffer.\n");
-	// 	exit(1);
-	// }
-}
+	VkResult res = vkAcquireNextImageKHR(vk_device, vk_swapchain,
+	                                     UINT64_MAX, psema, VK_NULL_HANDLE, &curr_img);
+	if(res == VK_ERROR_OUT_OF_DATE_KHR) {
+		fprintf(stderr, "Swapchain out of date.\n");
+		return;
+	}
+	assert(res == VK_SUCCESS);
 
-static bool record_cmd_clear(float r, float g, float b)
-{
-// 	VkCommandBufferBeginInfo binf;
-// 	binf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
-// 	binf.flags = VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT;
-
-// 	/* this function must be called outside a renderpass instance */
-// 	const VkClearColorValue pcolor[4] = {r, g, b, 1.0};
-
-// 	VkImageSubresourceRange range;
-// 	memset(&range, 0, sizeof range);
-// 	range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-// 	range.baseMipLevel = 0;
-// 	range.baseArrayLayer = 0;
-// 	range.layerCount = 1;
-
-// 	for(int i=0; i<vknum_swapchain_images; i++) {
-// 		/* layout for clearing */
-// 		VkImageMemoryBarrier cb;
-// 		memset(&cb, 0, sizeof cb);
-// 		cb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-// 		cb.srcAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-// 		cb.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-// 		cb.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-// 		cb.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-// 		cb.srcQueueFamilyIndex = vkqfamily;
-// 		cb.dstQueueFamilyIndex = vkqfamily;
-// 		cb.image = vkswapchain_images[i];
-// 		cb.subresourceRange = range;
-
-// 		/* layout for presenting */
-// 		VkImageMemoryBarrier pb;
-// 		memset(&pb, 0, sizeof pb);
-// 		pb.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
-// 		pb.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
-// 		pb.dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
-// 		pb.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-// 		pb.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
-// 		pb.srcQueueFamilyIndex = vkqfamily;
-// 		pb.dstQueueFamilyIndex = vkqfamily;
-// 		pb.image = vkswapchain_images[i];
-// 		pb.subresourceRange = range;
-
-// 		vkBeginCommandBuffer(swapchain_cmd_bufs[i], &binf);
-// 		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
-// 		                     VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, 0, 0, 0, 1, &pb);
-
-// 		vkCmdClearColorImage(swapchain_cmd_bufs[i], vkswapchain_images[vk_curr_swapchain_image], VK_IMAGE_LAYOUT_GENERAL,
-// 		                     pcolor, 1, &range);
-
-// 		vkCmdPipelineBarrier(swapchain_cmd_bufs[i], VK_PIPELINE_STAGE_TRANSFER_BIT,
-// 		                     VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, 0, 0, 0, 1, &cb);
-
-// 		if(vkEndCommandBuffer(swapchain_cmd_bufs[i]) != VK_SUCCESS) {
-// 			fprintf(stderr, "Failed to record command buffer.\n");
-// 			return false;
-// 		}
-// 	}
-// 	return true;
-// }
-
-// static bool create_swapchain_cmd_bufs(VkCommandPool cpool)
-// {
-// 	swapchain_cmd_bufs = new VkCommandBuffer[vknum_swapchain_images];
-
-// 	VkCommandBufferAllocateInfo ainf;
-// 	memset(&ainf, 0, sizeof ainf);
-
-// 	ainf.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
-// 	ainf.commandPool = cpool;
-// 	ainf.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
-// 	ainf.commandBufferCount = (uint32_t)vknum_swapchain_images;
-
-// 	if(vkAllocateCommandBuffers(vk_device, &ainf, swapchain_cmd_bufs) != VK_SUCCESS) {
-// 		fprintf(stderr, "Failed to allocate the swapchain command buffers.\n");
-// 		return false;
-// 	}
+	VkSubmitInfo sinf;
+	memset(&sinf, 0, sizeof sinf);
+	VkPipelineStageFlags psflags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
+	sinf.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
+	sinf.waitSemaphoreCount = 1;
+	sinf.pWaitSemaphores = &psema;
+	sinf.pWaitDstStageMask = &psflags;
+	sinf.commandBufferCount = 1;
+	sinf.pCommandBuffers = &rbufs[curr_img];
 
-	return true;
+	res = vkQueueSubmit(vk_queue, 1, &sinf, VK_NULL_HANDLE);
+	assert(res == VK_SUCCESS);
+
+	VkPresentInfoKHR pinf;
+	memset(&pinf, 0, sizeof pinf);
+	pinf.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
+	pinf.swapchainCount = 1;
+	pinf.pSwapchains = &vk_swapchain;
+	pinf.pImageIndices = &curr_img;
+
+	res = vkQueuePresentKHR(vk_queue, &pinf);
+	if(res == VK_ERROR_OUT_OF_DATE_KHR) {
+		fprintf(stderr, "Swapchain out of date.\n");
+	}
+	assert(res == VK_SUCCESS);
+
+	res = vkQueueWaitIdle(vk_queue);
+	assert(res == VK_SUCCESS);
+
+	vkDestroySemaphore(vk_device, psema, 0);
 }