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

diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc
index 9297e63..4a23211 100644
--- a/src/vulkan/vk.cc
+++ b/src/vulkan/vk.cc
@@ -56,10 +56,11 @@ 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 create_pipelines();
+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);
@@ -124,11 +125,16 @@ bool init_vulkan()
 		return false;
 	}
 
-	if(!create_framebuffers(fbs, iviews)) {
+	if(!create_framebuffers()) {
 		fprintf(stderr, "Failed to create the framebuffer.\n");
 		return false;
 	}
 
+	if(!create_pipelines()) {
+		fprintf(stderr, "Failed to create the pipelines.\n");
+		return false;
+	}
+
 	if(!end_init_command_buffer(&init_buf)) {
 		fprintf(stderr, "Failed to end the command buffer.\n");
 		return false;
@@ -348,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,
@@ -442,7 +449,7 @@ static bool create_renderpass()
 	return true;
 }
 
-static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
+static bool create_framebuffers()
 {
 	/* framebuffer attachments */
 	VkImageView fb_att[2];
@@ -459,8 +466,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;
 		}
@@ -468,6 +475,57 @@ static bool create_framebuffers(VkFramebuffer *fb, VkImageView *views)
 	return true;
 }
 
+static bool create_pipelines()
+{
+	VkDescriptorSetLayoutBinding dslb[1];
+	memset(&dslb[0], 0, sizeof dslb[0]);
+	dslb[0].binding = 0;
+	dslb[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+	dslb[0].descriptorCount = 1;
+	dslb[0].stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
+
+	VkDescriptorSetLayoutCreateInfo dslinf;
+	memset(&dslinf, 0, sizeof dslinf);
+	dslinf.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+	dslinf.bindingCount = 1; //dslb.size();
+	dslinf.pBindings = dslb;
+
+	VkDescriptorSetLayout dsl;
+	if(vkCreateDescriptorSetLayout(vk_device, &dslinf, 0, &dsl) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create descriptor set layout.\n");
+		return false;
+	}
+
+	VkPipelineLayoutCreateInfo pinf;
+	memset(&pinf, 0, sizeof pinf);
+	pinf.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+	pinf.setLayoutCount = 1;
+	pinf.pSetLayouts = &dsl;
+
+	VkPipelineLayout pl;
+	if(vkCreatePipelineLayout(vk_device, &pinf, 0, &pl) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create pipeline layout.\n");
+		return false;
+	}
+
+	VkPipelineCacheCreateInfo pcinf;
+	memset(&pcinf, 0, sizeof pcinf);
+	pcinf.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO;
+
+	VkPipelineCache pcache;
+	if(vkCreatePipelineCache(vk_device, &pcinf, 0, &pcache) != VK_SUCCESS) {
+		fprintf(stderr, "Failed to create pipeline cache.\n");
+		return false;
+	}
+
+	VkGraphicsPipelineCreateInfo ginf;
+	memset(&ginf, 0, sizeof ginf);
+	ginf.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
+	ginf.stageCount = 2;
+
+	return true;
+}
+
 static bool end_init_command_buffer(VkCommandBuffer *cb)
 {
 	if(vkEndCommandBuffer(*cb) != VK_SUCCESS) {
@@ -599,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);
@@ -618,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)