-Dev: VXGI and new Enviroment Pass

Author: AEspinosaDev

README.md

@@ -25,19 +25,19 @@ The main feautures of the library are:
 
 - Forward and Deferred pipelines support.
 - PBR, Phong and other types of materials abstractions.
-- Scene and scene objects abstractions.
-- On the fly shader compiling.
 - Raytracing Support (Shadows, AO).
+- Global Illumination with Voxel Cone Tracing.
+- On the fly shader compiling.
+- Diffuse and Specular IBL.
+- Physically Based Bloom.
+- Ray Marched SSR.
+- Scene and scene objects abstractions.
 - Texture loading with mipmapping.
-- Dynamic renderer states for some graphic features.
 - Multipass (depth pass for shadows, SSAO and post-processing).
+- Dynamic renderer states for some graphic features.
 - Vulkan object and functionality abstraction.
-- IBL.
-- Physically Based Bloom.
-- Ray Marched SSR.
 - Simple to use user interface.
 - Easy to distribute source code.
-- Global Illumination with Voxel Cone Tracing (wip)
 
 This project is a work in progress. It has a long way until becoming a decent library, there are no fancy features for now, but all the basics are here. Eventually, with time, I will be adding more advanced functionality.
 

include/engine/core/passes/composition_pass.h

@@ -128,8 +128,6 @@ class CompositionPass : public GraphicPass
 
     void update_uniforms(uint32_t frameIndex, Scene* const scene);
 
-    void set_envmap_descriptor(Graphics::Image env, Graphics::Image irr);
-
     void update();
 
     void cleanup();

include/engine/core/passes/enviroment_pass.h

@@ -15,6 +15,12 @@ VULKAN_ENGINE_NAMESPACE_BEGIN
 
 namespace Core {
 
+/*
+This pass does three things:
+- Performs a first renderpass to convert the HDRi image into a enviroment cubemap.
+- Performs a second renderpass to compute the diuffuse irradiance cubemap.
+- Performs a third renderpass to compute the specular irradiance cubemap.
+*/
 class EnviromentPass : public GraphicPass
 {
     ColorFormatType         m_format;
@@ -24,15 +30,18 @@ class EnviromentPass : public GraphicPass
     Extent2D                m_irradianceResolution;
 
   public:
-    EnviromentPass(Graphics::Device* ctx,
-                   ColorFormatType   format,
-                   Extent2D          extent,
-                   uint32_t          irradianceResolution,
-                   Mesh*             vignette)
-        : BasePass(ctx, extent, 2, CUBEMAP_FACES, false)
+    EnviromentPass(Graphics::Device* ctx, Mesh* vignette)
+        : BasePass(ctx, {1, 1}, 2, CUBEMAP_FACES, false)
         , m_vignette(vignette)
-        , m_format(format)
-        , m_irradianceResolution({irradianceResolution, irradianceResolution}) {
+        , m_format(SRGBA_32F)
+        , m_irradianceResolution({1, 1}) {
+    }
+
+    inline uint32_t get_irradiance_resolution() const {
+        return m_irradianceResolution.width;
+    }
+    inline void set_irradiance_resolution(uint32_t res) {
+        m_irradianceResolution = {res, res};
     }
 
     void setup_attachments(std::vector<Graphics::AttachmentInfo>&    attachments,
@@ -44,10 +53,12 @@ class EnviromentPass : public GraphicPass
 
     void setup_shader_passes();
 
-    void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
-
     void update_uniforms(uint32_t frameIndex, Scene* const scene);
 
+    void update();
+
+    void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
+
     void cleanup();
 };
 

include/engine/core/passes/geometry_pass.h

@@ -53,9 +53,10 @@ class GeometryPass : public GraphicPass
 
     void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
 
+    void link_previous_images(std::vector<Graphics::Image> images);
+
     void update_uniforms(uint32_t frameIndex, Scene* const scene);
 
-    void set_envmap_descriptor(Graphics::Image env, Graphics::Image irr);
 };
 } // namespace Core
 VULKAN_ENGINE_NAMESPACE_END

include/engine/core/passes/voxelization_pass.h

@@ -17,6 +17,10 @@ VULKAN_ENGINE_NAMESPACE_BEGIN
 
 namespace Core {
 
+/*
+Performs an voxelization of the direct irradiance of the scene. For setting the edges of the volume it takes into account the
+AABB of the scene.
+*/
 class VoxelizationPass : public GraphicPass
 {
 #ifdef USE_IMG_ATOMIC_OPERATION
@@ -48,13 +52,16 @@ class VoxelizationPass : public GraphicPass
 
     void setup_shader_passes();
 
-    void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
+    void link_previous_images(std::vector<Graphics::Image> images);
 
     void update_uniforms(uint32_t frameIndex, Scene* const scene);
 
     void update();
 
+    void render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex = 0);
+    
     void cleanup();
+
 };
 
 } // namespace Core

include/engine/core/resource_manager.h

@@ -12,8 +12,6 @@
 
 #include <engine/common.h>
 #include <engine/core/materials/material.h>
-#include <engine/core/passes/irradiance_compute_pass.h>
-#include <engine/core/passes/panorama_conversion_pass.h>
 #include <engine/core/textures/texture.h>
 #include <engine/core/textures/textureLDR.h>
 #include <engine/core/windows/window.h>
@@ -35,11 +33,6 @@ Static utility class that handles resource creation, uploading to the GPU and cl
 class ResourceManager
 {
   public:
-    /*
-    Auxiliar passes
-    */
-    static Core::PanoramaConverterPass*  panoramaConverterPass;
-    static Core::IrrandianceComputePass* irradianceComputePass;
     /*
     Texture Resources
     */
@@ -50,6 +43,7 @@ class ResourceManager
     Vignette for RTT
     */
     static Core::Mesh* VIGNETTE;
+
     /*
     Creates and initiates basic rendering resources such as fallback textures and a vignette
     */
@@ -83,10 +77,9 @@ class ResourceManager
     upload_geometry_data(Graphics::Device* const device, Core::Geometry* const g, bool createAccelStructure = true);
     static void destroy_geometry_data(Core::Geometry* const g);
     /*
-    Setup skybox
+    Uploads scene's skybox resources (cube mesh and panorama texture)
     */
-    static void setup_skybox(Graphics::Device* const device, Core::Scene* const scene);
-    static void generate_skybox_maps(Graphics::Frame* const currentFrame, Core::Scene* const scene);
+    static void upload_skybox_data(Graphics::Device* const device, Core::Skybox* const sky);
     /*
     Scene cleanup
     */

include/engine/graphics/descriptors.h

@@ -59,33 +59,32 @@ struct DescriptorPool {
     /*
     Set writes for Uniform Buffers
     */
-    void set_descriptor_write(Buffer*         buffer,
+    void update_descriptor(Buffer*         buffer,
                               size_t          dataSize,
                               size_t          readOffset,
                               DescriptorSet*  descriptor,
                               UniformDataType type,
                               uint32_t        binding);
-
     /*
     Set writes for Images
     */
-    void set_descriptor_write(Image*          image,
+    void update_descriptor(Image*          image,
                               ImageLayout     layout,
                               DescriptorSet*  descriptor,
                               uint32_t        binding,
                               UniformDataType type = UNIFORM_COMBINED_IMAGE_SAMPLER);
     /*
     Set writes for Image Array
     */
-    void set_descriptor_write(std::vector<Image>& images,
+    void update_descriptor(std::vector<Image>& images,
                               ImageLayout         layout,
                               DescriptorSet*      descriptor,
                               uint32_t            binding,
                               UniformDataType     type = UNIFORM_COMBINED_IMAGE_SAMPLER);
     /*
     Set writes for Acceleration Structures
     */
-    void set_descriptor_write(TLAS* accel, DescriptorSet* descriptor, uint32_t binding);
+    void update_descriptor(TLAS* accel, DescriptorSet* descriptor, uint32_t binding);
 
     void cleanup();
 };

include/engine/systems/renderers/deferred.h

@@ -1,16 +1,17 @@
 #ifndef DEFERRED_H
 #define DEFERRED_H
 
+#include <engine/systems/renderers/renderer.h>
+
 #include <engine/core/passes/bloom_pass.h>
 #include <engine/core/passes/composition_pass.h>
+#include <engine/core/passes/enviroment_pass.h>
 #include <engine/core/passes/geometry_pass.h>
 #include <engine/core/passes/postprocess_pass.h>
 #include <engine/core/passes/precomposition_pass.h>
 #include <engine/core/passes/variance_shadow_pass.h>
 #include <engine/core/passes/voxelization_pass.h>
 
-#include <engine/systems/renderers/renderer.h>
-
 VULKAN_ENGINE_NAMESPACE_BEGIN
 
 namespace Systems {
@@ -22,14 +23,15 @@ class DeferredRenderer : public BaseRenderer
 {
     enum RendererPasses
     {
-        SHADOW_PASS         = 0,
-        VOXELIZATION_PASS   = 1,
-        GEOMETRY_PASS       = 2,
-        PRECOMPOSITION_PASS = 3,
-        COMPOSITION_PASS    = 4,
-        BLOOM_PASS          = 5,
-        TONEMAPPIN_PASS     = 6,
-        FXAA_PASS           = 7,
+        ENVIROMENT_PASS     = 0,
+        SHADOW_PASS         = 1,
+        VOXELIZATION_PASS   = 2,
+        GEOMETRY_PASS       = 3,
+        PRECOMPOSITION_PASS = 4,
+        COMPOSITION_PASS    = 5,
+        BLOOM_PASS          = 6,
+        TONEMAPPIN_PASS     = 7,
+        FXAA_PASS           = 8,
     };
 
     // Graphic Settings
@@ -89,21 +91,21 @@ class DeferredRenderer : public BaseRenderer
         return m_AO;
     };
     inline void set_shading_output(Core::OutputBuffer output) {
-        static_cast<Core::CompositionPass*>(m_passes[COMPOSITION_PASS])->set_output_buffer(output);
+        get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->set_output_buffer(output);
     }
     inline Core::OutputBuffer get_shading_output() const {
+        // get_pass<Core::CompositionPass*>(COMPOSITION_PASS)->get_output_buffer();
         return static_cast<Core::CompositionPass*>(m_passes[COMPOSITION_PASS])->get_output_buffer();
     }
-    inline void set_clearcolor(Vec4 c) {
-        BaseRenderer::set_clearcolor(c);
-    }
 
   protected:
     virtual void on_before_render(Core::Scene* const scene);
 
     virtual void on_after_render(RenderResult& renderResult, Core::Scene* const scene);
 
     virtual void create_passes();
+
+    virtual void update_enviroment(Core::Skybox* const skybox);
 };
 } // namespace Systems
 VULKAN_ENGINE_NAMESPACE_END

include/engine/systems/renderers/forward.h

@@ -2,6 +2,7 @@
 #define FORWARD_H
 
 #include <engine/core/passes/bloom_pass.h>
+#include <engine/core/passes/enviroment_pass.h>
 #include <engine/core/passes/forward_pass.h>
 #include <engine/core/passes/postprocess_pass.h>
 #include <engine/core/passes/variance_shadow_pass.h>
@@ -20,11 +21,12 @@ class ForwardRenderer : public BaseRenderer
 
     enum RendererPasses
     {
-        SHADOW_PASS     = 0,
-        FORWARD_PASS    = 1,
-        BLOOM_PASS      = 2,
-        TONEMAPPIN_PASS = 3,
-        FXAA_PASS       = 4,
+        ENVIROMENT_PASS = 0,
+        SHADOW_PASS     = 1,
+        FORWARD_PASS    = 2,
+        BLOOM_PASS      = 3,
+        TONEMAPPIN_PASS = 4,
+        FXAA_PASS       = 5,
     };
 
     ShadowResolution m_shadowQuality = ShadowResolution::MEDIUM;
@@ -69,6 +71,8 @@ class ForwardRenderer : public BaseRenderer
     virtual void on_after_render(RenderResult& renderResult, Core::Scene* const scene);
 
     virtual void create_passes();
+
+    virtual void update_enviroment(Core::Skybox* const skybox);
 };
 } // namespace Systems
 VULKAN_ENGINE_NAMESPACE_END

include/engine/systems/renderers/renderer.h

@@ -13,6 +13,7 @@
 #define RENDERER_H
 
 #include <engine/common.h>
+#include <engine/core/passes/pass.h>
 #include <engine/core/resource_manager.h>
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
@@ -55,7 +56,6 @@ class BaseRenderer
     /*Passes*/
     std::vector<Core::BasePass*> m_passes;
 
-   
     /*Automatic deletion queue*/
     Graphics::Utils::DeletionQueue m_deletionQueue;
 
@@ -116,6 +116,9 @@ class BaseRenderer
     virtual inline void set_clearcolor(Vec4 c) {
         m_settings.clearColor = c;
     }
+    template <typename T> inline T get_pass(uint32_t id) {
+        return id < m_passes.size() ? static_cast<T>(m_passes[id]) : nullptr;
+    }
 
 #pragma endregion
 #pragma region Public Functions