Adding basic depth prepass

src/Engine/Graphics/Vulkan/VulkanDescriptorSets.cpp

@@ -8,8 +8,9 @@
 using namespace Seele;
 using namespace Seele::Vulkan;
 
-DescriptorLayout::DescriptorLayout(PGraphics graphics) 
-	: graphics(graphics)
+DescriptorLayout::DescriptorLayout(PGraphics graphics, const std::string& name)
+	: Gfx::DescriptorLayout(name)
+	, graphics(graphics)
 	, layoutHandle(VK_NULL_HANDLE)
 {
 }
@@ -67,6 +68,7 @@ void PipelineLayout::create()
 		// There could be unused descriptor set indices
 		if(descriptorSetLayouts[i] == nullptr)
 		{
+			vulkanDescriptorLayouts[i] = VK_NULL_HANDLE;
 			continue;
 		}
 		PDescriptorLayout layout = descriptorSetLayouts[i].cast<DescriptorLayout>();
@@ -81,7 +83,7 @@ void PipelineLayout::create()
 	{
 		vkPushConstants[i].offset = pushConstants[i].offset;
 		vkPushConstants[i].size = pushConstants[i].size;
-		vkPushConstants[i].stageFlags = cast((VkShaderStageFlagBits)pushConstants[i].stageFlags);
+		vkPushConstants[i].stageFlags = (VkShaderStageFlagBits)pushConstants[i].stageFlags;
 	}
 	createInfo.pushConstantRangeCount = (uint32)vkPushConstants.size();
 	createInfo.pPushConstantRanges = vkPushConstants.data();

src/Engine/Graphics/Vulkan/VulkanDescriptorSets.h

@@ -9,7 +9,7 @@ DECLARE_REF(Graphics)
 class DescriptorLayout : public Gfx::DescriptorLayout
 {
 public:
-	DescriptorLayout(PGraphics graphics);
+	DescriptorLayout(PGraphics graphics, const std::string& name);
 	virtual ~DescriptorLayout();
 	virtual void create();
 	inline VkDescriptorSetLayout getHandle() const
@@ -22,6 +22,7 @@ private:
 	PGraphics graphics;
 	Array<VkDescriptorSetLayoutBinding> bindings;
 	VkDescriptorSetLayout layoutHandle;
+	std::string name;
 	friend class DescriptorAllocator;
 };
 DEFINE_REF(DescriptorLayout)

src/Engine/Graphics/Vulkan/VulkanGraphics.cpp

@@ -164,6 +164,12 @@ Gfx::PGraphicsPipeline Graphics::createGraphicsPipeline(const GraphicsPipelineCr
 	return pipeline;
 }
 
+Gfx::PComputePipeline Graphics::createComputePipeline(const ComputePipelineCreateInfo& createInfo) 
+{
+	PComputePipeline pipeline = pipelineCache->createPipeline(createInfo);
+	return pipeline;
+}
+
 Gfx::PSamplerState Graphics::createSamplerState(const SamplerCreateInfo&) 
 {
 	PSamplerState sampler = new SamplerState(); // TODO: proper sampler creation
@@ -172,9 +178,9 @@ Gfx::PSamplerState Graphics::createSamplerState(const SamplerCreateInfo&)
 	VK_CHECK(vkCreateSampler(handle, &vkInfo, nullptr, &sampler->sampler));
 	return sampler;
 }
-Gfx::PDescriptorLayout Graphics::createDescriptorLayout()
+Gfx::PDescriptorLayout Graphics::createDescriptorLayout(const std::string& name)
 {
-	PDescriptorLayout layout = new DescriptorLayout(this);
+	PDescriptorLayout layout = new DescriptorLayout(this, name);
 	return layout;
 }
 Gfx::PPipelineLayout Graphics::createPipelineLayout()

src/Engine/Graphics/Vulkan/VulkanGraphics.h

@@ -60,9 +60,10 @@ public:
     virtual Gfx::PGeometryShader createGeometryShader(const ShaderCreateInfo& createInfo) override;
     virtual Gfx::PFragmentShader createFragmentShader(const ShaderCreateInfo& createInfo) override;
 	virtual Gfx::PGraphicsPipeline createGraphicsPipeline(const GraphicsPipelineCreateInfo& createInfo) override;
+	virtual Gfx::PComputePipeline createComputePipeline(const ComputePipelineCreateInfo& createInfo) override;
     virtual Gfx::PSamplerState createSamplerState(const SamplerCreateInfo& createInfo) override;
 
-	virtual Gfx::PDescriptorLayout createDescriptorLayout() override;
+	virtual Gfx::PDescriptorLayout createDescriptorLayout(const std::string& name = "") override;
 	virtual Gfx::PPipelineLayout createPipelineLayout() override;
 
 protected:

src/Engine/Graphics/Vulkan/VulkanGraphicsResources.h

@@ -319,7 +319,7 @@ public:
 	virtual ~Window();
 	virtual void beginFrame() override;
 	virtual void endFrame() override;
-	virtual Gfx::PTexture2D getBackBuffer() override;
+	virtual Gfx::PTexture2D getBackBuffer() const override;
 	virtual void onWindowCloseEvent() override;
 	virtual void setKeyCallback(std::function<void(KeyCode, InputAction, KeyModifier)> callback) override;
 	virtual void setMouseMoveCallback(std::function<void(double, double)> callback) override;

src/Engine/Graphics/Vulkan/VulkanPipeline.cpp

@@ -24,4 +24,26 @@ void GraphicsPipeline::bind(VkCommandBuffer handle)
 VkPipelineLayout GraphicsPipeline::getLayout() const
 {
     return layout.cast<PipelineLayout>()->getHandle();  
+}
+
+ComputePipeline::ComputePipeline(PGraphics graphics, VkPipeline handle, PPipelineLayout pipelineLayout, const ComputePipelineCreateInfo& createInfo) 
+    : Gfx::ComputePipeline(createInfo, pipelineLayout)
+    , graphics(graphics)
+    , pipeline(handle)
+{
+    
+}
+
+ComputePipeline::~ComputePipeline() 
+{
+}
+
+void ComputePipeline::bind(VkCommandBuffer handle) 
+{
+    vkCmdBindPipeline(handle, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline);
+}
+
+VkPipelineLayout ComputePipeline::getLayout() const
+{
+    return layout.cast<PipelineLayout>()->getHandle();
 }

src/Engine/Graphics/Vulkan/VulkanPipeline.h

@@ -19,5 +19,17 @@ private:
     VkPipeline pipeline;
 };
 DEFINE_REF(GraphicsPipeline)
+class ComputePipeline : public Gfx::ComputePipeline
+{
+public:
+    ComputePipeline(PGraphics graphics, VkPipeline handle, PPipelineLayout pipelineLayout, const ComputePipelineCreateInfo& createInfo);
+    virtual ~ComputePipeline();
+    void bind(VkCommandBuffer handle);
+    VkPipelineLayout getLayout() const;
+private:
+    PGraphics graphics;
+    VkPipeline pipeline;
+};
+DEFINE_REF(ComputePipeline)
 } // namespace Vulkan
 } // namespace Seele

src/Engine/Graphics/Vulkan/VulkanPipelineCache.cpp

@@ -352,4 +352,25 @@ PGraphicsPipeline PipelineCache::createPipeline(const GraphicsPipelineCreateInfo
 
     PGraphicsPipeline result = new GraphicsPipeline(graphics, pipelineHandle, layout, gfxInfo);
     return result;
+}
+
+PComputePipeline PipelineCache::createPipeline(const ComputePipelineCreateInfo& computeInfo) 
+{
+    VkComputePipelineCreateInfo createInfo;
+    createInfo.sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO;
+    createInfo.pNext = 0;
+    createInfo.flags = 0;
+    createInfo.basePipelineIndex = 0;
+    createInfo.basePipelineHandle = VK_NULL_HANDLE;
+    auto layout = computeInfo.pipelineLayout.cast<PipelineLayout>();
+    createInfo.layout = layout->getHandle();
+    auto computeStage = computeInfo.computeShader.cast<ComputeShader>();
+    createInfo.stage = init::PipelineShaderStageCreateInfo(
+        VK_SHADER_STAGE_COMPUTE_BIT,
+        computeStage->getModuleHandle(),
+        computeStage->getEntryPointName());
+    VkPipeline pipelineHandle;
+    VK_CHECK(vkCreateComputePipelines(graphics->getDevice(), cache, 1, &createInfo, nullptr, &pipelineHandle));
+    PComputePipeline result = new ComputePipeline(graphics, pipelineHandle, layout, computeInfo);
+    return result;
 }

src/Engine/Graphics/Vulkan/VulkanPipelineCache.h

@@ -11,6 +11,7 @@ public:
     PipelineCache(PGraphics graphics, const std::string& cacheFilePath);
     ~PipelineCache();
     PGraphicsPipeline createPipeline(const GraphicsPipelineCreateInfo& createInfo);
+    PComputePipeline createPipeline(const ComputePipelineCreateInfo& createInfo);
 private:
     VkPipelineCache cache;
     PGraphics graphics;

src/Engine/Graphics/Vulkan/VulkanShader.cpp

@@ -118,9 +118,9 @@ void Shader::create(const ShaderCreateInfo& createInfo)
     if(spCompile(request))
     {
         char const* diagnostics = spGetDiagnosticOutput(request);
+        std::cout << "Compile error for shader " << createInfo.name << std::endl;
         std::cout << diagnostics << std::endl;
     }
-
     size_t dataSize = 0;
     const uint32* data = reinterpret_cast<const uint32*>(spGetEntryPointCode(request, entryPointIndex, &dataSize));
 

src/Engine/Graphics/Vulkan/VulkanViewport.cpp

@@ -104,7 +104,7 @@ void Window::onWindowCloseEvent()
 {
 }
 
-Gfx::PTexture2D Window::getBackBuffer()
+Gfx::PTexture2D Window::getBackBuffer() const
 {
     return backBufferImages[currentImageIndex];
 }