Depth Buffer

Author: Pilzschaf

shaders/model_vert.glsl

@@ -11,6 +11,6 @@ layout(location = 0) out vec3 out_normal;
 
 void main() {
 	mat4 modelViewProj = u_pushConstants.modelViewProj;
-	gl_Position = modelViewProj * vec4(in_position.x, in_position.y, in_position.z, 1.0);
+	gl_Position = modelViewProj * vec4(in_position, 1.0);
 	out_normal = in_normal;
 }

shaders/model_vert.spv

@@ -19,6 +19,7 @@ VulkanContext* context;
 VkSurfaceKHR surface;
 VulkanSwapchain swapchain;
 VkRenderPass renderPass;
+std::vector<VulkanImage> depthBuffers;
 std::vector<VkFramebuffer> framebuffers;
 VulkanPipeline spritePipeline;
 VulkanPipeline modelPipeline;
@@ -54,17 +55,27 @@ void recreateRenderPass() {
 		for (uint32_t i = 0; i < framebuffers.size(); ++i) {
 			VK(vkDestroyFramebuffer(context->device, framebuffers[i], 0));
 		}
+		for(uint32_t i = 0; i < depthBuffers.size(); ++i) {
+			destroyImage(context, &depthBuffers[i]);
+		}
 		destroyRenderpass(context, renderPass);
 	}
 	framebuffers.clear();
+	depthBuffers.clear();
 
 	renderPass = createRenderPass(context, swapchain.format);
 	framebuffers.resize(swapchain.images.size());
+	depthBuffers.resize(swapchain.images.size());
 	for (uint32_t i = 0; i < swapchain.images.size(); ++i) {
+		createImage(context, &depthBuffers.data()[i], swapchain.width, swapchain.height, VK_FORMAT_D32_SFLOAT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
+		VkImageView attachments[] = {
+			swapchain.imageViews[i],
+			depthBuffers[i].view,
+		};
 		VkFramebufferCreateInfo createInfo = { VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO };
 		createInfo.renderPass = renderPass;
-		createInfo.attachmentCount = 1;
-		createInfo.pAttachments = &swapchain.imageViews[i];
+		createInfo.attachmentCount = ARRAY_COUNT(attachments);
+		createInfo.pAttachments = attachments;
 		createInfo.width = swapchain.width;
 		createInfo.height = swapchain.height;
 		createInfo.layers = 1;
@@ -313,18 +324,21 @@ void renderApplication() {
 		VkCommandBuffer commandBuffer = commandBuffers[frameIndex];
 		VKA(vkBeginCommandBuffer(commandBuffer, &beginInfo));
 
-		VkViewport viewport = { 0.0f, 0.0f, (float)swapchain.width, (float)swapchain.height };
+		VkViewport viewport = { 0.0f, 0.0f, (float)swapchain.width, (float)swapchain.height, 0.0f, 1.0f};
 		VkRect2D scissor = { {0, 0}, {swapchain.width, swapchain.height} };
 		vkCmdSetViewport(commandBuffer, 0, 1, &viewport);
 		vkCmdSetScissor(commandBuffer, 0, 1, &scissor);
 
-		VkClearValue clearValue = {0.0f, greenChannel, 1.0f, 1.0f};
+		VkClearValue clearValues[2] = {
+			{0.0f, greenChannel, 1.0f, 1.0f},
+			{0.0f, 0.0f},
+		};
 		VkRenderPassBeginInfo beginInfo = { VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO };
 		beginInfo.renderPass = renderPass;
 		beginInfo.framebuffer = framebuffers[imageIndex];
 		beginInfo.renderArea = { {0, 0}, {swapchain.width, swapchain.height} };
-		beginInfo.clearValueCount = 1;
-		beginInfo.pClearValues = &clearValue;
+		beginInfo.clearValueCount = ARRAY_COUNT(clearValues);
+		beginInfo.pClearValues = clearValues;
 		vkCmdBeginRenderPass(commandBuffer, &beginInfo, VK_SUBPASS_CONTENTS_INLINE);
 
 #if 0
@@ -415,6 +429,10 @@ void shutdownApplication() {
 		VK(vkDestroyFramebuffer(context->device, framebuffers[i], 0));
 	}
 	framebuffers.clear();
+	for(uint32_t i = 0; i < depthBuffers.size(); ++i) {
+		destroyImage(context, &depthBuffers[i]);
+	}
+	depthBuffers.clear();
 	destroyRenderpass(context, renderPass);
 	destroySwapchain(context, &swapchain);
 	VK(vkDestroySurfaceKHR(context->instance, surface, 0));

src/main.cpp

@@ -65,6 +65,13 @@ VulkanPipeline createPipeline(VulkanContext* context, const char* vertexShaderFi
 	VkPipelineMultisampleStateCreateInfo multisampleState = { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO };
 	multisampleState.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
 
+	VkPipelineDepthStencilStateCreateInfo depthStencilState = {VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO};
+	depthStencilState.depthTestEnable = VK_TRUE;
+	depthStencilState.depthWriteEnable = VK_TRUE;
+	depthStencilState.depthCompareOp = VK_COMPARE_OP_GREATER;
+	depthStencilState.minDepthBounds = 0.0f;
+	depthStencilState.maxDepthBounds = 1.0f;
+
 	VkPipelineColorBlendAttachmentState colorBlendAttachment = {};
 	colorBlendAttachment.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
 	colorBlendAttachment.blendEnable = VK_TRUE;
@@ -103,6 +110,7 @@ VulkanPipeline createPipeline(VulkanContext* context, const char* vertexShaderFi
 		createInfo.pViewportState = &viewportState;
 		createInfo.pRasterizationState = &rasterizationState;
 		createInfo.pMultisampleState = &multisampleState;
+		createInfo.pDepthStencilState = &depthStencilState;
 		createInfo.pColorBlendState = &colorBlendState;
 		createInfo.pDynamicState = &dynamicState;
 		createInfo.layout = pipelineLayout;

src/vulkan_base/vulkan_pipeline.cpp

@@ -3,23 +3,34 @@
 VkRenderPass createRenderPass(VulkanContext* context, VkFormat format) {
 	VkRenderPass renderPass;
 
-	VkAttachmentDescription attachmentDescription = {};
-	attachmentDescription.format = format;
-	attachmentDescription.samples = VK_SAMPLE_COUNT_1_BIT;
-	attachmentDescription.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-	attachmentDescription.storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-	attachmentDescription.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-	attachmentDescription.finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+	VkAttachmentDescription attachmentDescriptions[2];
+	attachmentDescriptions[0] = {};
+	attachmentDescriptions[0].format = format;
+	attachmentDescriptions[0].samples = VK_SAMPLE_COUNT_1_BIT;
+	attachmentDescriptions[0].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachmentDescriptions[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+	attachmentDescriptions[0].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachmentDescriptions[0].finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
+	attachmentDescriptions[1] = {};
+	attachmentDescriptions[1].format = VK_FORMAT_D32_SFLOAT;
+	attachmentDescriptions[1].samples = VK_SAMPLE_COUNT_1_BIT;
+	attachmentDescriptions[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
+	attachmentDescriptions[1].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
+	attachmentDescriptions[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+	attachmentDescriptions[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+
 	VkAttachmentReference attachmentReference = { 0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL };
+	VkAttachmentReference depthStencilReference = {1, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL};
 
 	VkSubpassDescription subpass = {};
 	subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
 	subpass.colorAttachmentCount = 1;
 	subpass.pColorAttachments = &attachmentReference;
+	subpass.pDepthStencilAttachment = &depthStencilReference;
 
 	VkRenderPassCreateInfo createInfo = { VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO };
-	createInfo.attachmentCount = 1;
-	createInfo.pAttachments = &attachmentDescription;
+	createInfo.attachmentCount = ARRAY_COUNT(attachmentDescriptions);
+	createInfo.pAttachments = attachmentDescriptions;
 	createInfo.subpassCount = 1;
 	createInfo.pSubpasses = &subpass;
 	VKA(vkCreateRenderPass(context->device, &createInfo, 0, &renderPass));

src/vulkan_base/vulkan_renderpass.cpp

@@ -125,12 +125,17 @@ void createImage(VulkanContext* context, VulkanImage* image, uint32_t width, uin
 	VKA(vkAllocateMemory(context->device, &allocateInfo, 0, &image->memory));
 	VKA(vkBindImageMemory(context->device, image->image, image->memory, 0));
 
+	VkImageAspectFlags aspect = VK_IMAGE_ASPECT_COLOR_BIT;
+	if(format == VK_FORMAT_D32_SFLOAT) {
+		aspect = VK_IMAGE_ASPECT_DEPTH_BIT;
+	}
+
 	{
 		VkImageViewCreateInfo createInfo = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO};
 		createInfo.image = image->image;
 		createInfo.viewType = VK_IMAGE_VIEW_TYPE_2D;
 		createInfo.format = format;
-		createInfo.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+		createInfo.subresourceRange.aspectMask = aspect;
 		createInfo.subresourceRange.levelCount = 1;
 		createInfo.subresourceRange.layerCount = 1;
 		VKA(vkCreateImageView(context->device, &createInfo, 0, &image->view));