G-Buffer bandwidth packed into less attachments (GeometryPass)

Author: AEspinosaDev

CMakeLists.txt

@@ -109,13 +109,13 @@ endif()
 # Choose if building demos directory. User-Defined.
 option(BUILD_EXAMPLES "Build Examples Directory" ON)
 if(BUILD_EXAMPLES)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/examples)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/examples)
 endif()
 # Choose if building demos directory. User-Defined.
 option(BUILD_TESTS "Build Tests Directory" ON)
 if(BUILD_TESTS)
     enable_testing()
-    add_subdirectory(${CMAKE_SOURCE_DIR}/tests)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
 endif()
 
 target_compile_definitions(VulkanEngine PUBLIC ENGINE_RESOURCES_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/")

include/engine/common.h

@@ -308,8 +308,10 @@ typedef enum ColorFormatTypeFlagBits
     RGBA_8U   = VK_FORMAT_R8G8B8A8_UNORM,
     R_32_UINT = VK_FORMAT_R32_UINT,
     DEPTH_16F = VK_FORMAT_D16_UNORM,
-    DEPTH_32F = VK_FORMAT_D32_SFLOAT
-} ColorFormatType;
+    DEPTH_32F = VK_FORMAT_D32_SFLOAT,
+    RGB10A2   = VK_FORMAT_A2B10G10R10_UNORM_PACK32,
+}
+ColorFormatType;
 typedef enum MipmapModeFlagsBits
 {
     MIPMAP_NEAREST = 0x00000001,

include/engine/core/geometries/geometry.h

@@ -101,7 +101,8 @@ class Geometry
     void             fill(Vec3* pos, Vec3* normal, Vec2* uv, Vec3* tangent, uint32_t vertNumber);
     void             fill_voxel_array(std::vector<Graphics::Voxel> voxels);
     static Geometry* create_quad();
-    static Geometry* create_cube();
+    static Geometry* create_simple_cube(); //Not for shading geometry
+    static Geometry* create_cube(); 
     static Geometry* create_cylinder(int segments = 1, float radius = 0.5, float height = 2.0);
     static void      compute_tangents_gram_smidt(std::vector<Graphics::Vertex>& vertices,
                                                  const std::vector<uint32_t>&   indices);

include/engine/core/passes/bloom_pass.h

@@ -32,7 +32,7 @@ A (first downsampled image).
 class BloomPass : public BaseGraphicPass
 {
   protected:
-    ColorFormatType m_colorFormat = SRGBA_32F;
+    ColorFormatType m_colorFormat = SRGBA_16F;
 
     Graphics::DescriptorSet m_imageDescriptorSet;
 

include/engine/core/passes/forward_pass.h

@@ -67,6 +67,8 @@ class ForwardPass : public BaseGraphicPass
     void setup_out_attachments(std::vector<Graphics::AttachmentConfig>&  attachments,
                                std::vector<Graphics::SubPassDependency>& dependencies) override;
 
+    void create_framebuffer() override;
+
     void setup_uniforms(std::vector<Graphics::Frame>& frames) override;
 
     void setup_shader_passes() override;

include/engine/core/passes/geometry_pass.h

@@ -43,22 +43,21 @@ class GeometryPass : public BaseGraphicPass
 
         Output Attachments:
         -
-        - Position buffer
-        - Normal buffer
+        - Normal + VelX buffer
         - Albedo buffer
         - Material buffer
-        - Emmissive buffer
+        - Emmissive + VelY buffer
         - Depth buffer
     */
     GeometryPass(Graphics::Device*        device,
-                 const PassLinkage<3, 6>& config,
+                 const PassLinkage<3, 5>& config,
                  Extent2D                 extent,
                  ColorFormatType          colorFormat,
                  ColorFormatType          depthFormat)
         : BaseGraphicPass(device, extent, 1, 1, true, false, "GEOMETRY")
         , m_colorFormat(colorFormat)
         , m_depthFormat(depthFormat) {
-        BasePass::store_attachments<3, 6>(config);
+        BasePass::store_attachments<3, 5>(config);
     }
 
     void setup_out_attachments(std::vector<Graphics::AttachmentConfig>&  attachments,

include/engine/core/passes/sky_pass.h

@@ -60,7 +60,7 @@ class SkyPass : public BaseGraphicPass
         BasePass::store_attachments<0, 1>(config);
     }
 
-    void create_framebuffer();
+    void create_framebuffer() override;
 
     virtual void setup_out_attachments(std::vector<Graphics::AttachmentConfig>&  attachments,
                                        std::vector<Graphics::SubPassDependency>& dependencies) override;

include/engine/core/scene/camera.h

@@ -51,6 +51,7 @@ class Camera : public Object3D
 
   private:
     Mat4 m_view;
+
     Mat4 m_proj;
 
     Frustum m_frustrum;
@@ -63,6 +64,7 @@ class Camera : public Object3D
 
     bool m_perspective{true};
     bool m_frustrumCulling{true};
+    bool m_inverse_Z{false};
 
     static int m_instanceCount;
 
@@ -76,7 +78,6 @@ class Camera : public Object3D
         Camera::m_instanceCount++;
     }
 
-    
     inline void set_field_of_view(float fov) {
         m_fov   = fov;
         isDirty = true;
@@ -86,13 +87,22 @@ class Camera : public Object3D
     }
     inline void set_projection(int width, int height) {
         m_aspect = (float)width / (float)height;
-        m_proj = math::perspectiveRH_ZO(math::radians(m_fov), m_aspect, m_near, m_far);
-        // m_proj = math::ortho(0.0f,(float)width,0.0f,(float)height,m_near,m_far);
+        if (m_perspective)
+            m_proj = !m_inverse_Z ? math::perspectiveRH_ZO(math::radians(m_fov), m_aspect, m_near, m_far)
+                                  : math::perspectiveRH_ZO(math::radians(m_fov), m_aspect, m_far, m_near);
+        else
+            m_proj = math::ortho(0.0f, (float)width, 0.0f, (float)height, m_near, m_far);
         m_proj[1][1] *= -1; // Because Vulkan
     }
     inline Mat4 get_projection() const {
         return m_proj;
     }
+    inline bool inverse_Z() const {
+        return m_inverse_Z;
+    }
+    inline void inverse_Z(bool op) {
+        m_inverse_Z = op;
+    }
     inline Mat4 get_view() {
         if (isDirty)
         {

include/engine/core/scene/skybox.h

@@ -56,11 +56,11 @@ class Skybox
   public:
     Skybox(TextureHDR* env)
         : m_env(env) {
-        m_box = Geometry::create_cube();
+        m_box = Geometry::create_simple_cube();
     }
     Skybox()
         : m_env(nullptr) {
-        m_box = Geometry::create_cube();
+        m_box = Geometry::create_simple_cube();
     }
     ~Skybox() {
         delete m_box;

resources/shaders/deferred/composition.glsl

@@ -51,11 +51,12 @@ layout(set = 0, binding = 6) uniform sampler2D samplerMap;
 layout(set = 0, binding = 7) uniform sampler2D brdfMap;
 layout(set = 0, binding = 8) uniform sampler3D voxelMap;
 //G-BUFFER
-layout(set = 1, binding = 0) uniform sampler2D positionBuffer;
+layout(set = 1, binding = 0) uniform sampler2D depthBuffer;
 layout(set = 1, binding = 1) uniform sampler2D normalBuffer;
 layout(set = 1, binding = 2) uniform sampler2D colorBuffer;
 layout(set = 1, binding = 3) uniform sampler2D materialBuffer;
 layout(set = 1, binding = 4) uniform sampler2D emissionBuffer;
+
 layout(set = 1, binding = 5) uniform sampler2D preCompositionBuffer;
 //TEMPORAL
 layout(set = 1, binding = 6) uniform sampler2D prevBuffer;
@@ -104,9 +105,15 @@ void main() {
     //////////////////////////////////////
     // SETUP SURFACE
     //////////////////////////////////////
-    vec4 positionData = texture(positionBuffer, v_uv);
-    g_pos = positionData.rgb;
-    g_depth = positionData.w;
+    g_depth =  texture(depthBuffer, v_uv).r;
+
+    // Build position from depth buffer
+    vec2 ndc = v_uv * 2.0 - 1.0;              
+    vec4 clip = vec4(ndc, g_depth, 1.0);
+    vec4 viewPos = camera.invProj * clip;
+    viewPos /= viewPos.w;
+    g_pos = viewPos.xyz;
+
     g_normal = normalize(texture(normalBuffer, v_uv).rgb);
     vec4 colorData = texture(colorBuffer, v_uv);
     g_albedo = colorData.rgb;
@@ -209,7 +216,7 @@ void main() {
                 if(settings.ssr.enabled == 1 && g_isReflective == 1) {
                     vec3 modelPos = vec3(camera.invView * vec4(g_pos, 1.0));
                     vec3 fresnel = fresnelSchlick(max(dot(g_normal, normalize(g_pos)), 0.0), brdf.F0);
-                    reflectedColor = performSSR(settings.ssr, g_pos, g_normal, modelPos, positionBuffer, prevBuffer, brdf.metalness, brdf.roughness, fresnel);
+                    reflectedColor = performSSR(settings.ssr, g_pos, g_normal, modelPos, depthBuffer, prevBuffer, brdf.metalness, brdf.roughness, fresnel);
                 }
 
             }
@@ -273,7 +280,7 @@ void main() {
 
     //Fog ________________________________
         if(scene.enableFog) {
-            float f = computeFog(g_depth);
+            float f = computeFog(1.0-g_depth);
             color = f * color + (1 - f) * scene.fogColor.rgb;
         }