wip (+33 squashed commit)

Squashed commit:

[6f640c5] cleanup

[08ed354] cleanup

[a67d61a] adjustable poisson kernel

[c10c3ad] poisson noise

[bcbdb8d] scene frag

[1d25a68] wip

[7d230fb] cleanup

[732a8e6] pcf NoL

[6476a0a] pcf

[81a83df] cleanup

[2e6b1e6] wip

[ca1288d] wip

[f71f222] wip

[d3220f0] wip

[34ba6ab] cleanup

[2ecafa0] it works

[ac2638b] wip

[e32622d] wip

[fa59864] trying learn opengl code

[d3bc9a0] not working

[1f96444] wip

[fadcfd4] wip

[6257d75] wip

[b800dda] wip

[ef8be53] wip

[a81315d] wip

[8911252] wip

[74cd2db] multiple views

[04e289d] image view

[e880a4c] wip

[23e8245] wip

[c0d1913] wip

[035cef9] wip

Author: azer89

HelloVulkan/Header/Apps/AppPBRShadow.h

@@ -46,7 +46,7 @@ class AppPBRShadow final : AppBase
 	std::unique_ptr<PipelineLightRender> lightPtr_;
 	std::unique_ptr<PipelineImGui> imguiPtr_;
 
-	std::unique_ptr<ResourcesLight> resLights_;
+	std::unique_ptr<ResourcesLight> resLight_;
 	std::unique_ptr<ResourcesShadow> resShadow_;
 
 	std::unique_ptr<Scene> scene_;

HelloVulkan/Header/Camera.h

@@ -32,12 +32,15 @@ class Camera
 	void ProcessMouseMovement(float xoffset, float yoffset, bool constrainPitch = true);
 	void ProcessMouseScroll(float yoffset);
 
-	glm::mat4 GetProjectionMatrix() const;
-	glm::mat4 GetViewMatrix() const;
-	glm::vec3 Position() const;
-	CameraUBO GetCameraUBO() const;
-	ClusterForwardUBO GetClusterForwardUBO() const;
-	RaytracingCameraUBO GetRaytracingCameraUBO() const;
+	[[nodiscard]] glm::mat4 GetProjectionMatrix() const;
+	[[nodiscard]] glm::mat4 GetViewMatrix() const;
+	[[nodiscard]] glm::vec3 Position() const;
+	[[nodiscard]] CameraUBO GetCameraUBO() const;
+	[[nodiscard]] ClusterForwardUBO GetClusterForwardUBO() const;
+	[[nodiscard]] RaytracingCameraUBO GetRaytracingCameraUBO() const;
+
+private:
+	void UpdateInternal();
 
 private:
 	glm::mat4 projectionMatrix_;
@@ -64,9 +67,6 @@ class Camera
 	// Screen size
 	float screenWidth_;
 	float screenHeight_;
-
-private:
-	void UpdateInternal();
 };
 
 #endif

HelloVulkan/Header/Configs.h

@@ -32,7 +32,7 @@ namespace CameraConfig
 	constexpr float Zoom = 45.0f;
 
 	constexpr float Near = 0.1f;
-	constexpr float Far = 100.0f;
+	constexpr float Far = 50.0f;
 }
 
 namespace ClusterForwardConfig
@@ -66,6 +66,7 @@ namespace IBLConfig
 namespace ShadowConfig
 {
 	constexpr uint32_t DepthSize = 4096;
+	constexpr uint32_t CascadeCount = 4u;
 }
 
 #endif

HelloVulkan/Header/Pipelines/PipelineShadow.h

@@ -3,7 +3,12 @@
 
 #include "PipelineBase.h"
 #include "ResourcesShadow.h"
+#include "ResourcesLight.h"
+#include "Camera.h"
 #include "Scene.h"
+#include "Configs.h"
+
+#include <array>
 
 class PipelineShadow final : public PipelineBase
 {
@@ -13,11 +18,10 @@ class PipelineShadow final : public PipelineBase
 		ResourcesShadow* resShadow);
 	~PipelineShadow();
 
-	void SetShadowMapUBO(VulkanContext& ctx, ShadowMapUBO& ubo)
-	{
-		const uint32_t frameIndex = ctx.GetFrameIndex();
-		shadowMapUBOBuffers_[frameIndex].UploadBufferData(ctx, &ubo, sizeof(ShadowMapUBO));
-	}
+	void CalculateCascade(VulkanContext& ctx, 
+		const Camera* camera,
+		const LightData* light, 
+		ShadowMapUBO* ubo);
 
 	virtual void FillCommandBuffer(VulkanContext& ctx, VkCommandBuffer commandBuffer) override;
 
@@ -30,6 +34,8 @@ class PipelineShadow final : public PipelineBase
 	Scene* scene_;
 	ResourcesShadow* resShadow_;
 
+	std::array<VulkanFramebuffer, ShadowConfig::CascadeCount> cascadeFramebuffers_;
+
 	std::vector<VulkanBuffer> shadowMapUBOBuffers_;
 	std::vector<VkDescriptorSet> descriptorSets_;
 	std::vector<VulkanBuffer> indirectBuffers_;

HelloVulkan/Header/PushConstants.h

@@ -28,4 +28,9 @@ struct PushConstPBR
 	float albedoMultipler = 0.0f; // Show albedo color if the scene is too dark, default value should be zero
 };
 
+struct PushConstCascadeShadow
+{
+	uint32_t cascadeIndex;
+};
+
 #endif

HelloVulkan/Header/Resources/ResourcesShadow.h

@@ -3,6 +3,9 @@
 
 #include "VulkanContext.h"
 #include "VulkanImage.h"
+#include "Configs.h"
+
+#include <array>
 
 struct ResourcesShadow
 {
@@ -11,10 +14,12 @@ struct ResourcesShadow
 	~ResourcesShadow();
 
 	void CreateSingleShadowMap(VulkanContext& ctx);
+	void CreateCascadeShadowMap(VulkanContext& ctx);
 	void Destroy();
 
 public:
 	VulkanImage shadowMap_;
+	std::array<VkImageView, ShadowConfig::CascadeCount> views_;
 
 private:
 	VkDevice device_;

HelloVulkan/Header/UBOs.h

@@ -1,6 +1,7 @@
 #ifndef UNIFORM_BUFFER_OBJECTS
 #define UNIFORM_BUFFER_OBJECTS
 
+#include "Configs.h"
 #include "glm/glm.hpp"
 
 // General-purpose
@@ -26,21 +27,21 @@ struct RaytracingCameraUBO
 struct ShadowMapUBO
 {
 	alignas(16)
-	glm::mat4 lightSpaceMatrix;
+	glm::mat4 lightSpaceMatrices[ShadowConfig::CascadeCount];
+	alignas(16)
+	glm::vec4 splitValues;
 	alignas(16)
 	glm::vec4 lightPosition;
 	alignas(4)
 	float shadowMinBias;
 	alignas(4)
 	float shadowMaxBias;
 	alignas(4)
-	float shadowNearPlane;
-	alignas(4)
-	float shadowFarPlane;
+	float cameraNearPlane;
 	alignas(4)
-	float pcfScale;
+	float cameraFarPlane;
 	alignas(4)
-	uint32_t pcfIteration;
+	float poissonSize;
 };
 
 // Per model transformation matrix

HelloVulkan/Header/Vulkan/VulkanContext.h

@@ -44,6 +44,8 @@ struct ContextConfig
 
 	bool supportBindlessRendering_ = true;
 
+	bool supportAnisotropicFilterting = false;
+
 	// TODO Set validation layer as optional
 };
 

HelloVulkan/Header/Vulkan/VulkanImage.h

@@ -72,6 +72,7 @@ class VulkanImage
 		float maxLod = 0.f,
 		VkFilter minFilter = VK_FILTER_LINEAR,
 		VkFilter maxFilter = VK_FILTER_LINEAR,
+		VkBool32 anisoptropy = VK_FALSE,
 		VkSamplerAddressMode addressMode = VK_SAMPLER_ADDRESS_MODE_REPEAT);
 
 	void CreateDefaultSampler(
@@ -80,6 +81,7 @@ class VulkanImage
 		float maxLod = 0.f,
 		VkFilter minFilter = VK_FILTER_LINEAR,
 		VkFilter maxFilter = VK_FILTER_LINEAR,
+		VkBool32 anisoptropy = VK_FALSE,
 		VkSamplerAddressMode addressMode = VK_SAMPLER_ADDRESS_MODE_REPEAT);
 
 	void CreateImage(
@@ -117,7 +119,6 @@ class VulkanImage
 		VulkanContext& ctx, 
 		uint32_t width, 
 		uint32_t height,
-		uint32_t layerCount,
 		VkSampleCountFlagBits sampleCount = VK_SAMPLE_COUNT_1_BIT,
 		VkImageUsageFlags additionalUsage = 0);
 
@@ -133,8 +134,22 @@ class VulkanImage
 		VkFormat format,
 		VkImageAspectFlags aspectFlags,
 		VkImageViewType viewType = VK_IMAGE_VIEW_TYPE_2D,
-		uint32_t layerCount = 1,
-		uint32_t mipCount = 1);
+		uint32_t mipLevel = 0u,
+		uint32_t mipCount = 1u,
+		uint32_t layerLevel = 0u,
+		uint32_t layerCount = 1u);
+
+	static void CreateImageView(
+		VulkanContext& ctx,
+		VkImage image,
+		VkImageView& view,
+		VkFormat format,
+		VkImageAspectFlags aspectFlags,
+		VkImageViewType viewType = VK_IMAGE_VIEW_TYPE_2D,
+		uint32_t mipLevel = 0u,
+		uint32_t mipCount = 1u,
+		uint32_t layerLevel = 0u,
+		uint32_t layerCount = 1u);
 
 	void CopyBufferToImage(
 		VulkanContext& ctx,

HelloVulkan/HelloVulkan.vcxproj

@@ -153,6 +153,8 @@
     <None Include="..\Shaders\LightData.glsl" />
     <None Include="..\Shaders\PBRPushConstants.glsl" />
     <None Include="..\Shaders\Radiance.glsl" />
+    <None Include="..\Shaders\ShadowMapping\Depth.frag" />
+    <None Include="..\Shaders\ShadowMapping\Poisson.glsl" />
     <None Include="..\Shaders\SlotBased\Mesh.frag" />
     <None Include="..\Shaders\SlotBased\Mesh.vert" />
     <None Include="..\Shaders\TangentNormalToWorld.glsl" />