Assets/Shaders/ToSwapchain_FS.glsl

@@ -3,17 +3,12 @@
 #extension GL_ARB_shading_language_420pack : enable
 #extension GL_EXT_nonuniform_qualifier : require
 
-layout (input_attachment_index = 0, set = 4, binding = 0) uniform subpassInput vec4 sceneTexture;
+layout (input_attachment_index = 0, set = 4, binding = 0) uniform subpassInput sceneTexture;
 
-layout(location = 0) in struct
-{
-  vec2 uv; // location = 0
-
-} In;
 
 layout(location = 0) out vec4 fragColor;
 
 void main()
 {
-  fragColor = vec4 (texture (sceneTexture, In.uv).rgb, 1.0f);
+  fragColor = vec4 (subpassLoad(sceneTexture).rgb, 1.0f);
 }

Assets/Shaders/ToSwapchain_FS.shshaderb.shmeta

@@ -0,0 +1,3 @@
+Name: ToSwapchain_FS
+ID: 36869006
+Type: 2

Assets/Shaders/ToSwapchain_VS.glsl

@@ -1,11 +1,6 @@
 #version 450
 #extension GL_KHR_vulkan_glsl : enable
 
-layout(location = 0) out struct
-{
-  vec2 uv; // location = 0
-
-} Out;
 
 vec2 CreateQuad(in uint vertexID)
 {
@@ -15,7 +10,6 @@ vec2 CreateQuad(in uint vertexID)
 
 void main()
 {
-  vec2 texCoord = CreateQuad (gl_VertexIndex);
+  vec2 vertexPos = CreateQuad(gl_VertexIndex) - vec2(0.5f);
-  vec2 vertexPos = texCoord - vec2(0.5f);
   gl_Position = vec4 (vertexPos, 0.0f, 1.0f);
 }

Assets/Shaders/ToSwapchain_VS.shshaderb.shmeta

@@ -0,0 +1,3 @@
+Name: ToSwapchain_VS
+ID: 48082949
+Type: 2

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp

@@ -125,7 +125,8 @@ namespace SHADE
     //SHAssetManager::CompileAsset("../../Assets/Shaders/UI_VS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Shaders/UI_FS.glsl", false);
     //SHAssetManager::CompileAsset("../../Assets/Models/Quad.gltf", false);
-
+    //SHAssetManager::CompileAsset("../../Assets/Shaders/ToSwapchain_VS.glsl", false);
+    //SHAssetManager::CompileAsset("../../Assets/Shaders/ToSwapchain_FS.glsl", false);
 
     // Load Built In Shaders
     static constexpr AssetID VS_DEFAULT    = 39210065;  defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
@@ -137,6 +138,8 @@ namespace SHADE
     static constexpr AssetID SSAO_BLUR     = 39760835;  ssaoBlurShader          = SHResourceManager::LoadOrGet<SHVkShaderModule>(SSAO_BLUR);
     static constexpr AssetID TEXT_VS       = 39816727;  textVS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_VS);
     static constexpr AssetID TEXT_FS       = 38024754;  textFS                  = SHResourceManager::LoadOrGet<SHVkShaderModule>(TEXT_FS);
+    static constexpr AssetID RENDER_SC_VS  = 48082949;  renderToSwapchainVS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_VS);
+    static constexpr AssetID RENDER_SC_FS  = 36869006;  renderToSwapchainFS     = SHResourceManager::LoadOrGet<SHVkShaderModule>(RENDER_SC_FS);
   }
 
   void SHGraphicsSystem::InitSceneRenderGraph(void) noexcept
@@ -300,6 +303,7 @@ namespace SHADE
         textRenderingSubSystem->Render(cmdBuffer, frameIndex);
       });
 
+#ifdef SHEDITOR
     {
       // Dummy Node to transition scene render graph resource
       auto dummyNode = screenRenderGraph->AddNode("Dummy Pass", { "Scene" }, { "Screen Space Pass" }); // no predecessors
@@ -307,7 +311,9 @@ namespace SHADE
       dummySubpass->AddInput("Scene");
     }
 
-    //screenRenderGraph->AddRenderToSwapchainNode ("Scene", "Present", )
+#else
+    screenRenderGraph->AddRenderToSwapchainNode("Scene", "Present", {"Screen Space Pass"}, {renderToSwapchainVS, renderToSwapchainFS});
+#endif
 
     screenRenderGraph->Generate();
 

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h

@@ -444,6 +444,8 @@ namespace SHADE
     Handle<SHVkShaderModule>                                  ssaoBlurShader;
     Handle<SHVkShaderModule>                                  textVS;
     Handle<SHVkShaderModule>                                  textFS;
+    Handle<SHVkShaderModule>                                  renderToSwapchainVS;
+    Handle<SHVkShaderModule>                                  renderToSwapchainFS;
 
     // Fonts
     Handle<SHFont>                                            testFont;

SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp

@@ -3,6 +3,8 @@
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
 #include "Graphics/RenderGraph/SHRenderGraphNode.h"
+#include "Graphics/RenderGraph/SHSubpass.h"
+#include "Graphics/SHVkUtil.h"
 
 namespace SHADE
 {
@@ -25,14 +27,34 @@ namespace SHADE
         .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts(),
       });
 
-    auto newPipeline = logicalDevice->CreateGraphicsPipeline(pipelineLayout, nullptr, renderGraphNode->GetRenderpass(), subpass);
+    pipeline = logicalDevice->CreateGraphicsPipeline(pipelineLayout, nullptr, renderGraphNode->GetRenderpass(), subpass);
 
     SHInputAssemblyState inputAssembly{};
     inputAssembly.topology = vk::PrimitiveTopology::eTriangleFan;
 
-    newPipeline->GetPipelineState().SetInputAssemblyState(inputAssembly);
+    pipeline->GetPipelineState().SetInputAssemblyState(inputAssembly);
 
-    newPipeline->ConstructPipeline();
+    SHColorBlendState colorBlendState{};
+    colorBlendState.logic_op_enable = VK_FALSE;
+    colorBlendState.logic_op = vk::LogicOp::eCopy;
+
+    auto const& subpassColorReference = subpass->GetColorAttachmentReferences()[0];
+    colorBlendState.attachments.push_back(vk::PipelineColorBlendAttachmentState
+      {
+        .blendEnable = SHVkUtil::IsBlendCompatible(subpass->GetFormatFromAttachmentReference(subpassColorReference.attachment)),
+        .srcColorBlendFactor = vk::BlendFactor::eSrcAlpha,
+        .dstColorBlendFactor = vk::BlendFactor::eOneMinusSrcAlpha,
+        .colorBlendOp = vk::BlendOp::eAdd,
+        .srcAlphaBlendFactor = vk::BlendFactor::eOne,
+        .dstAlphaBlendFactor = vk::BlendFactor::eZero,
+        .alphaBlendOp = vk::BlendOp::eAdd,
+        .colorWriteMask = vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG | vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA,
+      }
+    );
+
+    pipeline->GetPipelineState().SetColorBlenState(colorBlendState);
+
+    pipeline->ConstructPipeline();
 
   }
 

SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp

@@ -281,7 +281,7 @@ namespace SHADE
     }
 
     //// maybe do this in handle resize? 
-    //UpdateWriteDescriptors();
+    UpdateWriteDescriptors();
   }
 
   void SHSubpass::UpdateWriteDescriptors(void) noexcept