Add missing depth attachment barrier

Author: SaschaWillems

base/VulkanFrameBuffer.hpp

@@ -304,7 +304,7 @@ namespace vks
 			}
 
 			// Use subpass dependencies for attachment layout transitions
-			std::array<VkSubpassDependency, 3> dependencies{};
+			std::array<VkSubpassDependency, 4> dependencies{};
 
 			dependencies[0].srcSubpass = VK_SUBPASS_EXTERNAL;
 			dependencies[0].dstSubpass = 0;
@@ -313,6 +313,7 @@ namespace vks
 			dependencies[0].srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
 			dependencies[0].dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT;
 
+
 			dependencies[1].srcSubpass = VK_SUBPASS_EXTERNAL;
 			dependencies[1].dstSubpass = 0;
 			dependencies[1].srcStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
@@ -327,14 +328,21 @@ namespace vks
 			dependencies[2].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
 			dependencies[2].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
 
+			dependencies[3].srcSubpass = 0;
+			dependencies[3].dstSubpass = VK_SUBPASS_EXTERNAL;
+			dependencies[3].srcStageMask = VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+			dependencies[3].dstStageMask = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT;
+			dependencies[3].srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
+			dependencies[3].dstAccessMask = VK_ACCESS_SHADER_READ_BIT;
+
 			// Create render pass
 			VkRenderPassCreateInfo renderPassInfo = {};
 			renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
 			renderPassInfo.pAttachments = attachmentDescriptions.data();
 			renderPassInfo.attachmentCount = static_cast<uint32_t>(attachmentDescriptions.size());
 			renderPassInfo.subpassCount = 1;
 			renderPassInfo.pSubpasses = &subpass;
-			renderPassInfo.dependencyCount = 3;
+			renderPassInfo.dependencyCount = 4;
 			renderPassInfo.pDependencies = dependencies.data();
 			VK_CHECK_RESULT(vkCreateRenderPass(vulkanDevice->logicalDevice, &renderPassInfo, nullptr, &renderPass));
 

examples/deferredshadows/deferredshadows.cpp

@@ -13,7 +13,7 @@
 #include "VulkanglTFModel.h"
 
 // Must match the LIGHT_COUNT define in the shadow and deferred shaders
-#define LIGHT_COUNT 3
+constexpr auto LIGHT_COUNT = 3;
 
 class VulkanExample : public VulkanExampleBase
 {