stub ssgi example

tadgem · Jul 1, 2024 · a4f478d · a4f478d
1 parent 8c33f17
commit a4f478d
Show file tree

Hide file tree

Showing 90 changed files with 25,612 additions and 98 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,3 +44,4 @@ add_subdirectory(examples/compute)
 add_subdirectory(examples/im3d-test)
 add_subdirectory(examples/im3d-multiview)
 add_subdirectory(examples/pipeline-abstraction)
+add_subdirectory(examples/ssgi)
diff --git a/examples/pipeline-abstraction/main.cpp b/examples/pipeline-abstraction/main.cpp
@@ -90,7 +90,7 @@ struct ViewData
     Mesh        m_ViewQuad;
 };
 
-Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgram& gbufferProg, ShaderProgram& lightPassProg, ShaderProgram& ssgiProg)
+Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgram& gbufferProg, ShaderProgram& lightPassProg)
 {
     Pipeline p{};
     auto* gbuffer = p.AddFramebuffer(vk);
@@ -114,18 +114,7 @@ Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgra
     lightPassMat->SetColourAttachment(vk, "normalBufferSampler", *gbuffer, 2);
     lightPassMat->SetColourAttachment(vk, "colourBufferSampler", *gbuffer, 0);
 
-    auto* finalImage = p.AddFramebuffer(vk);
-    finalImage->AddColourAttachment(vk, ResolutionScale::Full, 1, VK_SAMPLE_COUNT_1_BIT, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
-        VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_ASPECT_COLOR_BIT);
-    finalImage->Build(vk);
-
-    auto* ssgiMat = p.AddMaterial(vk, ssgiProg);
-    ssgiMat->SetDepthAttachment(vk, "depthImageSampler", *gbuffer);
-    ssgiMat->SetColourAttachment(vk, "positionBufferSampler", *gbuffer, 1);
-    ssgiMat->SetColourAttachment(vk, "normalBufferSampler", *gbuffer, 2);
-    ssgiMat->SetColourAttachment(vk, "lightPassImageSampler", *lightPassImage, 0);
-
-    p.SetOutputFramebuffer(finalImage);
+    p.SetOutputFramebuffer(lightPassImage);
 
 
     // create gbuffer pipeline
@@ -151,28 +140,15 @@ Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgra
         VK_POLYGON_MODE_FILL, VK_CULL_MODE_NONE, false,
         VK_COMPARE_OP_LESS, lightPassPipelineLayout);
 
-    VkPipelineLayout ssgiPassPipelineLayout;
-    VkPipeline ssgiPassPipeline= vk.CreateRasterizationGraphicsPipeline(
-        ssgiProg,
-        Vector<VkVertexInputBindingDescription>{VertexDataPosUv::GetBindingDescription() },
-        VertexDataPosUv::GetAttributeDescriptions(),
-        finalImage->m_RenderPass,
-        vk.m_SwapChainImageExtent.width, vk.m_SwapChainImageExtent.height,
-        VK_POLYGON_MODE_FILL, VK_CULL_MODE_NONE, false,
-        VK_COMPARE_OP_LESS, ssgiPassPipelineLayout);
-
 
     VkPipelineData* gbufferPipelineData = p.AddPipeline(vk, gbufferPipeline, gbufferPipelineLayout );
     VkPipelineData* lightPassPipelineData = p.AddPipeline(vk, lightPassPipeline, lightPassPipelineLayout);
-    VkPipelineData* ssgiPassPipelineData = p.AddPipeline(vk, ssgiPassPipeline, ssgiPassPipelineLayout);
-
     auto* im3dViewState = p.AddIm3d(vk, im3dState);
 
     p.RecordCommands(
         [
             gbuffer, gbufferPipelineData, 
             lightPassImage, lightPassPipelineData, lightPassMat, 
-            finalImage, ssgiPassPipelineData, ssgiMat,
             &vk, &im3dState, im3dViewState
         ]
             (auto& commandBuffer, uint32_t frameIndex, View& view, Mesh& screenQuad, Vector<Renderable> renderables)
@@ -291,69 +267,6 @@ Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgra
                 vkCmdBindIndexBuffer(commandBuffer, screenQuad.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
                 vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, lightPassPipelineData->m_PipelineLayout, 0, 1, &lightPassMat->m_DescriptorSets[0].m_Sets[frameIndex], 0, nullptr);
                 vkCmdDrawIndexed(commandBuffer, screenQuad.m_IndexCount, 1, 0, 0, 0);
-
-                vkCmdEndRenderPass(commandBuffer);
-            }
-            // SS Horizon GI pass
-            {
-                struct SSGIPCData
-                {
-                    glm::mat4   view;
-                    glm::mat4   proj;
-                    glm::vec4   resolutionFov;
-                    glm::vec4   eyePos;
-                    uint32_t    frameIndex;
-                };
-
-                SSGIPCData data{};
-                data.view = view.m_Camera.View;
-                data.proj = view.m_Camera.Proj;
-                data.resolutionFov = glm::vec4{ static_cast<float>(view.m_CurrentResolution.width), static_cast<float>(view.m_CurrentResolution.height), view.m_Camera.FOV, 0.0f };
-                data.eyePos = glm::vec4(view.m_Camera.Position, 0.0);
-                data.frameIndex = frameCount++;
-
-                Array<VkClearValue, 1> clearValues{};
-                clearValues[0].color = { {0.0f, 0.0f, 0.0f, 1.0f} };
-
-                VkRenderPassBeginInfo renderPassInfo{};
-                renderPassInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
-                renderPassInfo.renderPass = finalImage->m_RenderPass;
-                renderPassInfo.framebuffer = finalImage->m_SwapchainFramebuffers[frameIndex];
-                renderPassInfo.renderArea.offset = { 0,0 };
-                renderPassInfo.renderArea.extent = viewExtent;
-
-                renderPassInfo.clearValueCount = static_cast<uint32_t>(clearValues.size());
-                renderPassInfo.pClearValues = clearValues.data();
-
-                vkCmdBeginRenderPass(commandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
-
-                vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, ssgiPassPipelineData->m_Pipeline);
-                VkViewport viewport{};
-                viewport.x = 0.0f;
-                viewport.x = 0.0f;
-                viewport.width = static_cast<float>(viewExtent.width);
-                viewport.height = static_cast<float>(viewExtent.height);
-                viewport.minDepth = 0.0f;
-                viewport.maxDepth = 1.0f;
-
-                VkRect2D scissor{};
-                scissor.offset = { 0,0 };
-                scissor.extent = VkExtent2D{
-                    static_cast<uint32_t>(viewExtent.width),
-                    static_cast<uint32_t>(viewExtent.height)
-                };
-
-                // issue with lighting pass is that uvs are just 0,0 -> 1,1
-                // meaning the entire buffer will be resampled
-                vkCmdSetViewport(commandBuffer, 0, 1, &viewport);
-                vkCmdSetScissor(commandBuffer, 0, 1, &scissor);
-                vkCmdPushConstants(commandBuffer, ssgiPassPipelineData->m_PipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(SSGIPCData), &data);
-                VkDeviceSize sizes[] = { 0 };
-                vkCmdBindVertexBuffers(commandBuffer, 0, 1, &screenQuad.m_VertexBuffer, sizes);
-                vkCmdBindIndexBuffer(commandBuffer, screenQuad.m_IndexBuffer, 0, VK_INDEX_TYPE_UINT32);
-                vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, ssgiPassPipelineData->m_PipelineLayout, 0, 1, &ssgiMat->m_DescriptorSets[0].m_Sets[frameIndex], 0, nullptr);
-                vkCmdDrawIndexed(commandBuffer, screenQuad.m_IndexCount, 1, 0, 0, 0);
-
                 DrawIm3d(vk, commandBuffer, frameIndex, im3dState, *im3dViewState, view.m_Camera.Proj * view.m_Camera.View, viewExtent.width, viewExtent.height);
                 vkCmdEndRenderPass(commandBuffer);
             }
@@ -362,9 +275,9 @@ Pipeline CreateViewPipeline(VulkanAPI& vk, LvkIm3dState& im3dState, ShaderProgra
     return p;
 }
 
-ViewData CreateView(VulkanAPI& vk, LvkIm3dState im3dState, ShaderProgram gbufferProg, ShaderProgram lightPassProg, ShaderProgram& ssgiProg)
+ViewData CreateView(VulkanAPI& vk, LvkIm3dState im3dState, ShaderProgram gbufferProg, ShaderProgram lightPassProg)
 {
-    Pipeline pipeline = CreateViewPipeline(vk, im3dState, gbufferProg, lightPassProg, ssgiProg);
+    Pipeline pipeline = CreateViewPipeline(vk, im3dState, gbufferProg, lightPassProg);
 
     static Vector<VertexDataPosUv> screenQuadVerts = {
                     { { -1.0f, -1.0f , 0.0f}, { 0.0f, 0.0f } },
@@ -683,11 +596,10 @@ int main() {
 
     ShaderProgram gbufferProg = ShaderProgram::Create(vk, "shaders/gbuffer.vert.spv", "shaders/gbuffer.frag.spv");
     ShaderProgram lightPassProg = ShaderProgram::Create(vk, "shaders/lights.vert.spv", "shaders/lights.frag.spv");
-    ShaderProgram ssgiProg = ShaderProgram::Create(vk, "shaders/lights.vert.spv", "shaders/ssgi.frag.spv");
-
-    ViewData viewA = CreateView(vk, im3dState, gbufferProg, lightPassProg, ssgiProg);
+
+    ViewData viewA = CreateView(vk, im3dState, gbufferProg, lightPassProg);
     viewA.m_View.m_Camera.Position = { -40.0, 10.0f, 30.0f };
-    ViewData viewB = CreateView(vk, im3dState, gbufferProg, lightPassProg, ssgiProg);
+    ViewData viewB = CreateView(vk, im3dState, gbufferProg, lightPassProg);
     viewB.m_View.m_Camera.Position = { 30.0, 0.0f, -20.0f };
 
     Vector<ViewData*> views{ &viewA, &viewB };

diff --git a/examples/pipeline-abstraction/shaders/ssgi.frag.spv b/examples/pipeline-abstraction/shaders/ssgi.frag.spv
diff --git a/examples/ssgi/CMakeLists.txt b/examples/ssgi/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.14)
+project(example-ssgi)
+
+set (CMAKE_CXX_STANDARD 17)
+
+add_executable(${PROJECT_NAME} main.cpp)
+
+get_filename_component(EXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+
+
+target_include_directories (${PROJECT_NAME} PUBLIC ${LVK_SDL_INCLUDES} ${EXAMPLES_DIR} ${ASSIMP_INCLUDES})
+
+target_link_libraries (${PROJECT_NAME} lvk lvk-sdl assimp)
+
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/shaders DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/examples/ssgi/assets/Sponza/10381718147657362067.jpg b/examples/ssgi/assets/Sponza/10381718147657362067.jpg
diff --git a/examples/ssgi/assets/Sponza/10388182081421875623.jpg b/examples/ssgi/assets/Sponza/10388182081421875623.jpg
diff --git a/examples/ssgi/assets/Sponza/11474523244911310074.jpg b/examples/ssgi/assets/Sponza/11474523244911310074.jpg
diff --git a/examples/ssgi/assets/Sponza/11490520546946913238.jpg b/examples/ssgi/assets/Sponza/11490520546946913238.jpg
diff --git a/examples/ssgi/assets/Sponza/11872827283454512094.jpg b/examples/ssgi/assets/Sponza/11872827283454512094.jpg
diff --git a/examples/ssgi/assets/Sponza/11968150294050148237.jpg b/examples/ssgi/assets/Sponza/11968150294050148237.jpg
diff --git a/examples/ssgi/assets/Sponza/1219024358953944284.jpg b/examples/ssgi/assets/Sponza/1219024358953944284.jpg
diff --git a/examples/ssgi/assets/Sponza/12501374198249454378.jpg b/examples/ssgi/assets/Sponza/12501374198249454378.jpg
diff --git a/examples/ssgi/assets/Sponza/13196865903111448057.jpg b/examples/ssgi/assets/Sponza/13196865903111448057.jpg
diff --git a/examples/ssgi/assets/Sponza/13824894030729245199.jpg b/examples/ssgi/assets/Sponza/13824894030729245199.jpg
diff --git a/examples/ssgi/assets/Sponza/13982482287905699490.jpg b/examples/ssgi/assets/Sponza/13982482287905699490.jpg
diff --git a/examples/ssgi/assets/Sponza/14118779221266351425.jpg b/examples/ssgi/assets/Sponza/14118779221266351425.jpg
diff --git a/examples/ssgi/assets/Sponza/14170708867020035030.jpg b/examples/ssgi/assets/Sponza/14170708867020035030.jpg
diff --git a/examples/ssgi/assets/Sponza/14267839433702832875.jpg b/examples/ssgi/assets/Sponza/14267839433702832875.jpg
diff --git a/examples/ssgi/assets/Sponza/14650633544276105767.jpg b/examples/ssgi/assets/Sponza/14650633544276105767.jpg
diff --git a/examples/ssgi/assets/Sponza/15295713303328085182.jpg b/examples/ssgi/assets/Sponza/15295713303328085182.jpg
diff --git a/examples/ssgi/assets/Sponza/15722799267630235092.jpg b/examples/ssgi/assets/Sponza/15722799267630235092.jpg
diff --git a/examples/ssgi/assets/Sponza/16275776544635328252.png b/examples/ssgi/assets/Sponza/16275776544635328252.png
diff --git a/examples/ssgi/assets/Sponza/16299174074766089871.jpg b/examples/ssgi/assets/Sponza/16299174074766089871.jpg
diff --git a/examples/ssgi/assets/Sponza/16885566240357350108.jpg b/examples/ssgi/assets/Sponza/16885566240357350108.jpg
diff --git a/examples/ssgi/assets/Sponza/17556969131407844942.jpg b/examples/ssgi/assets/Sponza/17556969131407844942.jpg
diff --git a/examples/ssgi/assets/Sponza/17876391417123941155.jpg b/examples/ssgi/assets/Sponza/17876391417123941155.jpg
diff --git a/examples/ssgi/assets/Sponza/2051777328469649772.jpg b/examples/ssgi/assets/Sponza/2051777328469649772.jpg
diff --git a/examples/ssgi/assets/Sponza/2185409758123873465.jpg b/examples/ssgi/assets/Sponza/2185409758123873465.jpg
diff --git a/examples/ssgi/assets/Sponza/2299742237651021498.jpg b/examples/ssgi/assets/Sponza/2299742237651021498.jpg
diff --git a/examples/ssgi/assets/Sponza/2374361008830720677.jpg b/examples/ssgi/assets/Sponza/2374361008830720677.jpg
diff --git a/examples/ssgi/assets/Sponza/2411100444841994089.jpg b/examples/ssgi/assets/Sponza/2411100444841994089.jpg
diff --git a/examples/ssgi/assets/Sponza/2775690330959970771.jpg b/examples/ssgi/assets/Sponza/2775690330959970771.jpg
diff --git a/examples/ssgi/assets/Sponza/2969916736137545357.jpg b/examples/ssgi/assets/Sponza/2969916736137545357.jpg
diff --git a/examples/ssgi/assets/Sponza/332936164838540657.jpg b/examples/ssgi/assets/Sponza/332936164838540657.jpg
diff --git a/examples/ssgi/assets/Sponza/3371964815757888145.jpg b/examples/ssgi/assets/Sponza/3371964815757888145.jpg
diff --git a/examples/ssgi/assets/Sponza/3455394979645218238.jpg b/examples/ssgi/assets/Sponza/3455394979645218238.jpg
diff --git a/examples/ssgi/assets/Sponza/3628158980083700836.jpg b/examples/ssgi/assets/Sponza/3628158980083700836.jpg
diff --git a/examples/ssgi/assets/Sponza/3827035219084910048.jpg b/examples/ssgi/assets/Sponza/3827035219084910048.jpg
diff --git a/examples/ssgi/assets/Sponza/4477655471536070370.jpg b/examples/ssgi/assets/Sponza/4477655471536070370.jpg
diff --git a/examples/ssgi/assets/Sponza/4601176305987539675.jpg b/examples/ssgi/assets/Sponza/4601176305987539675.jpg
diff --git a/examples/ssgi/assets/Sponza/466164707995436622.jpg b/examples/ssgi/assets/Sponza/466164707995436622.jpg
diff --git a/examples/ssgi/assets/Sponza/4675343432951571524.jpg b/examples/ssgi/assets/Sponza/4675343432951571524.jpg
diff --git a/examples/ssgi/assets/Sponza/4871783166746854860.jpg b/examples/ssgi/assets/Sponza/4871783166746854860.jpg
diff --git a/examples/ssgi/assets/Sponza/4910669866631290573.jpg b/examples/ssgi/assets/Sponza/4910669866631290573.jpg
diff --git a/examples/ssgi/assets/Sponza/4975155472559461469.jpg b/examples/ssgi/assets/Sponza/4975155472559461469.jpg
diff --git a/examples/ssgi/assets/Sponza/5061699253647017043.png b/examples/ssgi/assets/Sponza/5061699253647017043.png
diff --git a/examples/ssgi/assets/Sponza/5792855332885324923.jpg b/examples/ssgi/assets/Sponza/5792855332885324923.jpg
diff --git a/examples/ssgi/assets/Sponza/5823059166183034438.jpg b/examples/ssgi/assets/Sponza/5823059166183034438.jpg
diff --git a/examples/ssgi/assets/Sponza/6047387724914829168.jpg b/examples/ssgi/assets/Sponza/6047387724914829168.jpg
diff --git a/examples/ssgi/assets/Sponza/6151467286084645207.jpg b/examples/ssgi/assets/Sponza/6151467286084645207.jpg
diff --git a/examples/ssgi/assets/Sponza/6593109234861095314.jpg b/examples/ssgi/assets/Sponza/6593109234861095314.jpg
diff --git a/examples/ssgi/assets/Sponza/6667038893015345571.jpg b/examples/ssgi/assets/Sponza/6667038893015345571.jpg
diff --git a/examples/ssgi/assets/Sponza/6772804448157695701.jpg b/examples/ssgi/assets/Sponza/6772804448157695701.jpg
diff --git a/examples/ssgi/assets/Sponza/7056944414013900257.jpg b/examples/ssgi/assets/Sponza/7056944414013900257.jpg
diff --git a/examples/ssgi/assets/Sponza/715093869573992647.jpg b/examples/ssgi/assets/Sponza/715093869573992647.jpg
diff --git a/examples/ssgi/assets/Sponza/7268504077753552595.jpg b/examples/ssgi/assets/Sponza/7268504077753552595.jpg
diff --git a/examples/ssgi/assets/Sponza/7441062115984513793.jpg b/examples/ssgi/assets/Sponza/7441062115984513793.jpg
diff --git a/examples/ssgi/assets/Sponza/755318871556304029.jpg b/examples/ssgi/assets/Sponza/755318871556304029.jpg
diff --git a/examples/ssgi/assets/Sponza/759203620573749278.jpg b/examples/ssgi/assets/Sponza/759203620573749278.jpg
diff --git a/examples/ssgi/assets/Sponza/7645212358685992005.jpg b/examples/ssgi/assets/Sponza/7645212358685992005.jpg
diff --git a/examples/ssgi/assets/Sponza/7815564343179553343.jpg b/examples/ssgi/assets/Sponza/7815564343179553343.jpg
diff --git a/examples/ssgi/assets/Sponza/8006627369776289000.png b/examples/ssgi/assets/Sponza/8006627369776289000.png
diff --git a/examples/ssgi/assets/Sponza/8051790464816141987.jpg b/examples/ssgi/assets/Sponza/8051790464816141987.jpg
diff --git a/examples/ssgi/assets/Sponza/8114461559286000061.jpg b/examples/ssgi/assets/Sponza/8114461559286000061.jpg
diff --git a/examples/ssgi/assets/Sponza/8481240838833932244.jpg b/examples/ssgi/assets/Sponza/8481240838833932244.jpg
diff --git a/examples/ssgi/assets/Sponza/8503262930880235456.jpg b/examples/ssgi/assets/Sponza/8503262930880235456.jpg
diff --git a/examples/ssgi/assets/Sponza/8747919177698443163.jpg b/examples/ssgi/assets/Sponza/8747919177698443163.jpg
diff --git a/examples/ssgi/assets/Sponza/8750083169368950601.jpg b/examples/ssgi/assets/Sponza/8750083169368950601.jpg
diff --git a/examples/ssgi/assets/Sponza/8773302468495022225.jpg b/examples/ssgi/assets/Sponza/8773302468495022225.jpg
diff --git a/examples/ssgi/assets/Sponza/8783994986360286082.jpg b/examples/ssgi/assets/Sponza/8783994986360286082.jpg
diff --git a/examples/ssgi/assets/Sponza/9288698199695299068.jpg b/examples/ssgi/assets/Sponza/9288698199695299068.jpg
diff --git a/examples/ssgi/assets/Sponza/9916269861720640319.jpg b/examples/ssgi/assets/Sponza/9916269861720640319.jpg
diff --git a/examples/ssgi/assets/Sponza/Sponza.bin b/examples/ssgi/assets/Sponza/Sponza.bin