Fix bug disabling FXAA

AEspinosaDev · AEspinosaDev · commit b83979cf9e23 · 2024-11-14T10:58:31.000+01:00
diff --git a/examples/renderer-app/application.cpp b/examples/renderer-app/application.cpp
@@ -27,14 +27,12 @@ void VulkanRenderer::init(Systems::RendererSettings settings, Systems::ForwardRe
 void VulkanRenderer::run(int argc, char* argv[]) {
 
     Systems::RendererSettings settings{};
-    settings.samplesMSAA = MSAASamples::MSAA_x8;
-    // settings.colorFormat = ColorFormatType::SRGBA_8;
-    // settings.depthFormat = DepthFormatType::D16F;
+    settings.samplesMSAA = MSAASamples::_NONE;
     settings.clearColor = Vec4(0.02, 0.02, 0.02, 1.0);
     settings.enableUI   = true;
     Systems::ForwardRendererSettings settings2{};
     settings2.shadowQuality = ShadowResolution::MEDIUM;
-    settings2.fxaa          = false;
+    settings2.fxaa          = true;
 
     if (argc == 1)
         std::cout << "No arguments submitted, initializing with default parameters..." << std::endl;
diff --git a/include/engine/graphics/command_buffer.h b/include/engine/graphics/command_buffer.h
@@ -12,11 +12,12 @@
 #include <engine/common.h>
 #include <engine/graphics/buffer.h>
 #include <engine/graphics/framebuffer.h>
+#include <engine/graphics/semaphore.h>
 #include <engine/graphics/shaderpass.h>
 #include <engine/graphics/utilities/initializers.h>
-#include <engine/graphics/vk_renderpass.h>
-#include <engine/graphics/semaphore.h>
 #include <engine/graphics/vao.h>
+#include <engine/graphics/vk_renderpass.h>
+
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 
@@ -49,7 +50,7 @@ class CommandBuffer
                 std::vector<Semaphore> waitSemaphores   = {},
                 std::vector<Semaphore> signalSemaphores = {});
 
-    VkCommandBuffer& get_handle()  {
+    VkCommandBuffer& get_handle() {
         return m_handle;
     }
 
@@ -59,6 +60,7 @@ class CommandBuffer
 
     void begin_renderpass(VulkanRenderPass&        renderpass,
                           Framebuffer&             fbo,
+                          Extent2D                 extent,
                           std::vector<Attachment>& attachments,
                           VkSubpassContents        subpassContents = VK_SUBPASS_CONTENTS_INLINE);
     void end_renderpass();
@@ -94,7 +96,7 @@ class CommandPool
         return m_handle;
     }
 
-    void init(VkDevice                device,
+    void init(VkDevice                 device,
               uint32_t                 queueFamilyIndex,
               VkCommandPoolCreateFlags flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT);
 
diff --git a/include/engine/graphics/device.h b/include/engine/graphics/device.h
@@ -121,6 +121,7 @@ class Device
                             std::vector<SubPassDependency>& dependencies);
 
     void create_framebuffer(Framebuffer&             fbo,
+                            Extent2D                 extent,
                             VulkanRenderPass&        renderpass,
                             std::vector<Attachment>& attachments,
                             uint32_t                 layers = 1);
diff --git a/include/engine/graphics/framebuffer.h b/include/engine/graphics/framebuffer.h
@@ -27,15 +27,15 @@ class Framebuffer
     Framebuffer() {
     }
 
-    inline VkFramebuffer& get_handle()  {
+    inline VkFramebuffer& get_handle() {
         return m_handle;
     }
 
     inline uint32_t get_layer_count() const {
         return m_layers;
     }
 
-    void init(VulkanRenderPass& renderpass, std::vector<Attachment>& attachments, uint32_t layers = 1);
+    void init(VulkanRenderPass& renderpass, Extent2D extent, std::vector<Attachment>& attachments, uint32_t layers = 1);
 
     void cleanup();
 };
diff --git a/src/core/renderpasses/forward_pass.cpp b/src/core/renderpasses/forward_pass.cpp
@@ -256,7 +256,7 @@ void ForwardPass::render(Graphics::Frame& currentFrame, Scene* const scene, uint
     PROFILING_EVENT()
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex],m_extent, m_attachments);
     cmd->set_viewport(m_extent);
 
     if (scene->get_active_camera() && scene->get_active_camera()->is_active())
diff --git a/src/core/renderpasses/fxaa_pass.cpp b/src/core/renderpasses/fxaa_pass.cpp
@@ -57,7 +57,7 @@ void FXAAPass::setup_shader_passes() {
 void FXAAPass::render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex) {
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex],m_extent, m_attachments);
     cmd->set_viewport(m_extent);
 
     ShaderPass* shaderPass = m_shaderPasses["fxaa"];
diff --git a/src/core/renderpasses/irradiance_compute_pass.cpp b/src/core/renderpasses/irradiance_compute_pass.cpp
@@ -55,7 +55,7 @@ void IrrandianceComputePass::setup_shader_passes() {
 void IrrandianceComputePass::render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex) {
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[0], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[0], m_extent,m_attachments);
     cmd->set_viewport(m_extent);
 
     ShaderPass* shaderPass = m_shaderPasses["irr"];
diff --git a/src/core/renderpasses/panorama_conversion_pass.cpp b/src/core/renderpasses/panorama_conversion_pass.cpp
@@ -56,7 +56,7 @@ void PanoramaConverterPass::setup_shader_passes() {
 void PanoramaConverterPass::render(Graphics::Frame& currentFrame, Scene* const scene, uint32_t presentImageIndex) {
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[0], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[0],m_extent, m_attachments);
     cmd->set_viewport(m_extent);
 
     ShaderPass* shaderPass = m_shaderPasses["converter"];
diff --git a/src/core/renderpasses/renderpass.cpp b/src/core/renderpasses/renderpass.cpp
@@ -58,7 +58,7 @@ void RenderPass::create_framebuffer() {
         if (m_isDefault) // If its default need swapchain PRESENT images
             framebufferAttachments[presentViewIndex].image = m_device->get_swapchain().get_present_images()[fb];
 
-        m_device->create_framebuffer(m_framebuffers[fb], m_handle, framebufferAttachments, m_framebufferImageDepth);
+        m_device->create_framebuffer(m_framebuffers[fb], m_extent, m_handle, framebufferAttachments, m_framebufferImageDepth);
     }
 }
 
diff --git a/src/core/renderpasses/shadow_pass.cpp b/src/core/renderpasses/shadow_pass.cpp
@@ -151,7 +151,7 @@ void ShadowPass::render(Graphics::Frame& currentFrame, Scene* const scene, uint3
     PROFILING_EVENT()
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex],m_extent, m_attachments);
     cmd->set_viewport(m_extent);
 
     cmd->set_depth_bias_enable(true);
diff --git a/src/core/renderpasses/variance_shadow_pass.cpp b/src/core/renderpasses/variance_shadow_pass.cpp
@@ -152,7 +152,7 @@ void VarianceShadowPass::render(Graphics::Frame& currentFrame, Scene* const scen
     PROFILING_EVENT()
 
     CommandBuffer* cmd = currentFrame.commandBuffer;
-    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex], m_attachments);
+    cmd->begin_renderpass(m_handle, m_framebuffers[presentImageIndex], m_extent, m_attachments);
     cmd->set_viewport(m_extent);
 
     cmd->set_depth_bias_enable(true);
diff --git a/src/graphics/command_buffer.cpp b/src/graphics/command_buffer.cpp
@@ -59,7 +59,6 @@ void CommandBuffer::begin(VkCommandBufferUsageFlags flags) {
         throw VKFW_Exception("Command buffer is already recording!");
     }
 
-
     VkCommandBufferBeginInfo beginInfo = Init::command_buffer_begin_info();
 
     if (vkBeginCommandBuffer(m_handle, &beginInfo) != VK_SUCCESS)
@@ -133,13 +132,12 @@ void CommandBuffer::submit(VkQueue                queue,
 
 void CommandBuffer::begin_renderpass(VulkanRenderPass&        renderpass,
                                      Framebuffer&             fbo,
+                                     Extent2D                 extent,
                                      std::vector<Attachment>& attachments,
                                      VkSubpassContents        subpassContents) {
 
     VkRenderPassBeginInfo renderPassInfo =
-        Init::renderpass_begin_info(renderpass.get_handle(),
-                                    {attachments.front().image.extent.width, attachments.front().image.extent.height},
-                                    fbo.get_handle());
+        Init::renderpass_begin_info(renderpass.get_handle(), extent, fbo.get_handle());
 
     std::vector<VkClearValue> clearValues;
     clearValues.reserve(attachments.size());
diff --git a/src/graphics/device.cpp b/src/graphics/device.cpp
@@ -121,10 +121,11 @@ void Device::create_render_pass(VulkanRenderPass&               rp,
     rp.init(m_handle, attachments, dependencies);
 }
 void Device::create_framebuffer(Framebuffer&             fbo,
+                                Extent2D                 extent,
                                 VulkanRenderPass&        renderpass,
                                 std::vector<Attachment>& attachments,
                                 uint32_t                 layers) {
-    fbo.init(renderpass, attachments, layers);
+    fbo.init(renderpass, extent, attachments, layers);
 }
 
 RenderResult Device::aquire_present_image(Semaphore& waitSemahpore, uint32_t& imageIndex) {
@@ -446,7 +447,6 @@ void Device::create_TLAS(TLAS& accel, std::vector<BLAS>& blases) {
                        VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
                        VMA_MEMORY_USAGE_GPU_ONLY);
 
-   
     VkAccelerationStructureBuildGeometryInfoKHR accelerationBuildGeometryInfo{};
     accelerationBuildGeometryInfo.sType = VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_GEOMETRY_INFO_KHR;
     accelerationBuildGeometryInfo.type  = VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR;
@@ -477,7 +477,6 @@ void Device::create_TLAS(TLAS& accel, std::vector<BLAS>& blases) {
 
     scratchBuffer.cleanup();
     instanceBuffer.cleanup();
-
 }
 void Device::wait() {
     VK_CHECK(vkDeviceWaitIdle(m_handle));
diff --git a/src/graphics/framebuffer.cpp b/src/graphics/framebuffer.cpp
@@ -2,7 +2,10 @@
 
 VULKAN_ENGINE_NAMESPACE_BEGIN
 namespace Graphics {
-void Framebuffer::init(VulkanRenderPass& renderpass, std::vector<Attachment>& attachments, uint32_t layers) {
+void Framebuffer::init(VulkanRenderPass&        renderpass,
+                       Extent2D                 extent,
+                       std::vector<Attachment>& attachments,
+                       uint32_t                 layers) {
 
     m_device = renderpass.get_device_handle();
     m_layers = layers;
@@ -18,11 +21,10 @@ void Framebuffer::init(VulkanRenderPass& renderpass, std::vector<Attachment>& at
         viewAttachments[i] = attachments[i].image.view;
     }
 
-    VkFramebufferCreateInfo fbInfo = Init::framebuffer_create_info(
-        renderpass.get_handle(), {attachments[0].image.extent.width, attachments[0].image.extent.height});
-    fbInfo.pAttachments    = viewAttachments.data();
-    fbInfo.attachmentCount = (uint32_t)viewAttachments.size();
-    fbInfo.layers          = layers;
+    VkFramebufferCreateInfo fbInfo = Init::framebuffer_create_info(renderpass.get_handle(), extent);
+    fbInfo.pAttachments            = viewAttachments.data();
+    fbInfo.attachmentCount         = (uint32_t)viewAttachments.size();
+    fbInfo.layers                  = layers;
 
     if (vkCreateFramebuffer(m_device, &fbInfo, nullptr, &m_handle) != VK_SUCCESS)
     {

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ class Framebuffer`
`27`	`27`	`Framebuffer() {`
`28`	`28`	`}`
`29`	`29`
`30`		`- inline VkFramebuffer& get_handle() {`
	`30`	`+ inline VkFramebuffer& get_handle() {`
`31`	`31`	`return m_handle;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`inline uint32_t get_layer_count() const {`
`35`	`35`	`return m_layers;`
`36`	`36`	`}`
`37`	`37`
`38`		`- void init(VulkanRenderPass& renderpass, std::vector<Attachment>& attachments, uint32_t layers = 1);`
	`38`	`+ void init(VulkanRenderPass& renderpass, Extent2D extent, std::vector<Attachment>& attachments, uint32_t layers = 1);`
`39`	`39`
`40`	`40`	`void cleanup();`
`41`	`41`	`};`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void RenderPass::create_framebuffer() {`
`58`	`58`	`if (m_isDefault) // If its default need swapchain PRESENT images`
`59`	`59`	`framebufferAttachments[presentViewIndex].image = m_device->get_swapchain().get_present_images()[fb];`
`60`	`60`
`61`		`- m_device->create_framebuffer(m_framebuffers[fb], m_handle, framebufferAttachments, m_framebufferImageDepth);`
	`61`	`+ m_device->create_framebuffer(m_framebuffers[fb], m_extent, m_handle, framebufferAttachments, m_framebufferImageDepth);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`