Enhance RenderSystem with RPS and dynamic resource management

sample/App/SampleApp.h

@@ -34,56 +34,55 @@ class SampleApp final : public gore::App
     void PreRender();
 
     // Temporary RenderPassDesc for pipeline creation
-    void InitializeRpsSystem();
-    void CreateRenderPassDesc();
-    void CreateUnifiedGlobalDynamicBuffer();
-    void CreateGlobalBindGroup();
-    void CreatePipelines();
+    // void CreateRenderPassDesc();
+    // void CreateUnifiedGlobalDynamicBuffer();
+    // void CreateGlobalBindGroup();
+    // void CreatePipelines();
 
-    void CreateDefaultResources();
+    // void CreateDefaultResources();
 
-    void CreateForwardPipeline();
-    void CreateShadowmapPipeline();
+    // void CreateForwardPipeline();
+    // void CreateShadowmapPipeline();
 
-    const int K_OBJECT_BATCH_COUNT = 128;
+    // const int K_OBJECT_BATCH_COUNT = 128;
 
-    void UpdateAllGameObjectsGPUPerObjectData();
+    // // void UpdateAllGameObjectsGPUPerObjectData();
 
-    static void DrawTriangleWithRPSWrapper(const RpsCmdCallbackContext* pContext);
-    static void ShadowmapPassWithRPSWrapper(const RpsCmdCallbackContext* pContext);
-    static void ForwardOpaquePassWithRPSWrapper(const RpsCmdCallbackContext* pContext);
+    // static void DrawTriangleWithRPSWrapper(const RpsCmdCallbackContext* pContext);
+    // static void ShadowmapPassWithRPSWrapper(const RpsCmdCallbackContext* pContext);
+    // static void ForwardOpaquePassWithRPSWrapper(const RpsCmdCallbackContext* pContext);
 private:
     void UpdateFPSText(float deltaTime);
 
     gore::gfx::GraphicsCaps m_GraphicsCaps;
 
-    struct SampleRenderPass
-    {
-        RenderPassDesc forwardPassDesc;
-        RenderPassDesc shadowPassDesc;
-    } renderPasses;
-
-    struct SamplePipeline
-    {
-        GraphicsPipelineHandle blankPipeline;
-        GraphicsPipelineHandle forwardPipeline;
-        GraphicsPipelineHandle shadowPipeline;
-        GraphicsPipelineHandle gbuffferPipeline;
-    } pipelines;
-
-    struct DefaultResources
-    {
-        gore::gfx::TextureHandle whiteTexture;
-        gore::gfx::TextureHandle blackTexture;
-    } defaultResources;
-
-    gore::gfx::BufferHandle m_UnifiedDynamicBuffer;
-    gore::gfx::SamplerHandle m_ShadowmapSampler;
-    gore::gfx::DynamicBufferHandle m_UnifiedDynamicBufferHandle;
-
-    gore::gfx::BindLayout m_GlobalBindLayout;
-    gore::gfx::BindGroupHandle m_GlobalBindGroup;
-    gore::gfx::BufferHandle m_GlobalConstantBuffer;
+    // struct SampleRenderPass
+    // {
+    //     RenderPassDesc forwardPassDesc;
+    //     RenderPassDesc shadowPassDesc;
+    // } renderPasses;
+
+    // struct SamplePipeline
+    // {
+    //     GraphicsPipelineHandle blankPipeline;
+    //     GraphicsPipelineHandle forwardPipeline;
+    //     GraphicsPipelineHandle shadowPipeline;
+    //     GraphicsPipelineHandle gbuffferPipeline;
+    // } pipelines;
+
+    // struct DefaultResources
+    // {
+    //     gore::gfx::TextureHandle whiteTexture;
+    //     gore::gfx::TextureHandle blackTexture;
+    // } defaultResources;
+
+    // gore::gfx::BufferHandle m_UnifiedDynamicBuffer;
+    // gore::gfx::SamplerHandle m_ShadowmapSampler;
+    // gore::gfx::DynamicBufferHandle m_UnifiedDynamicBufferHandle;
+
+    // gore::gfx::BindLayout m_GlobalBindLayout;
+    // gore::gfx::BindGroupHandle m_GlobalBindGroup;
+    // gore::gfx::BufferHandle m_GlobalConstantBuffer;
 private:
     gore::Scene* scene;
 };

src/Core/App.cpp

@@ -58,8 +58,8 @@ int App::Run(int width, int height, const char* title)
     MicroProfileSetEnableAllGroups(true);
     MicroProfileSetForceMetaCounters(true);
 
-    MICROPROFILE_SCOPE(g_AppInitialize);
     {   
+        MICROPROFILE_SCOPE(g_AppInitialize);
         glfwInit();
 
         m_Window = new Window(this, width, height);

src/Rendering/BindGroup.h

@@ -14,12 +14,11 @@ namespace gore::gfx
 
 enum class UpdateFrequency : uint8_t
 {
-    None,
-    PerFrame,
+    Persistent,
     PerBatch,
-    // We should never use this, but it's here for completeness
     PerDraw,
-    Count
+    Count,
+    PerFrame // deprecated
 };
 
 struct TextureBinding final
@@ -52,10 +51,17 @@ struct SamplerBinding final
     BindType bindType    = BindType::Sampler;
 };
 
+struct BindGroupUpdateDesc final
+{
+    std::vector<TextureBinding> textures = {};
+    std::vector<BufferBinding> buffers   = {};
+    std::vector<SamplerBinding> samplers  = {};
+};
+
 struct BindGroupDesc final
 {
     const char* debugName                = nullptr;
-    UpdateFrequency updateFrequency      = UpdateFrequency::None;
+    UpdateFrequency updateFrequency      = UpdateFrequency::Persistent;
     std::vector<TextureBinding> textures = {};
     std::vector<BufferBinding> buffers   = {};
     std::vector<SamplerBinding> samplers  = {};

src/Rendering/Components/Material.cpp

@@ -6,7 +6,8 @@ namespace gore::renderer
 {
 Material::Material() noexcept :
     m_Passes(),
-    m_AlphaMode(AlphaMode::Opaque)
+    m_AlphaMode(AlphaMode::Opaque),
+    m_DynamicBuffer()
 {
 }
 

src/Rendering/Components/Material.h

@@ -5,7 +5,7 @@
 
 #include "Rendering/Pipeline.h"
 #include "Rendering/BindGroup.h"
-
+#include "Rendering/DynamicBuffer.h"
 namespace gore::renderer
 {
 using namespace gore::gfx;
@@ -69,9 +69,10 @@ ENGINE_CLASS(Material) final
     }
 
     GETTER_SETTER(AlphaMode, AlphaMode)
-
+    GETTER_SETTER(DynamicBufferHandle, DynamicBuffer)
 private:
     std::vector<Pass> m_Passes;
+    DynamicBufferHandle m_DynamicBuffer;
     AlphaMode m_AlphaMode;
 };
 } // namespace gore::renderer

src/Rendering/DrawStream/Draw.cpp

@@ -13,7 +13,10 @@ bool MatchDrawFilter(const Pass& pass, const DrawCreateInfo& info)
     return pass.name == info.passName;
 }
 
-void PrepareDrawDataAndSort(DrawCreateInfo& info, std::vector<GameObject*>& gameObjects, std::vector<Draw>& sortedDrawData)
+void PrepareDrawDataAndSort(DrawCreateInfo& info
+    , std::vector<GameObject*>& gameObjects
+    , std::vector<Draw>& sortedDrawData
+    , Material* overrideMaterial)
 {
     auto& renderContext = *RenderContext::GetInstance();
 
@@ -26,16 +29,16 @@ void PrepareDrawDataAndSort(DrawCreateInfo& info, std::vector<GameObject*>& game
         if (renderer->IsValid() == false)
             continue;
 
-        auto handle         = renderer->GetDynamicBuffer();
+        auto handle         = overrideMaterial? overrideMaterial->GetDynamicBuffer() : renderer->GetDynamicBuffer();
 
-        Material& material = renderer->GetMaterial();
+        Material& material = overrideMaterial ? *overrideMaterial : renderer->GetMaterial();
         for (const auto& pass : material.GetPasses())
         {
             if (MatchDrawFilter(pass, info) == false)
                 continue;
 
             Draw draw;
-            assert(pass.shader.empty() == false);
+            // assert(pass.shader.empty() == false);
 
             draw.shader       = pass.shader;
             draw.bindGroup[0] = pass.bindGroup[0];

src/Rendering/DrawStream/Draw.h

@@ -115,7 +115,7 @@ struct DrawSorter
     }
 };
 
-void PrepareDrawDataAndSort(DrawCreateInfo& info, std::vector<GameObject*>& gameObjects, std::vector<Draw>& sortedDrawData);
+void PrepareDrawDataAndSort(DrawCreateInfo& info, std::vector<GameObject*>& gameObjects, std::vector<Draw>& sortedDrawData, Material* overrideMaterial = nullptr);
 bool MatchDrawFilter(const Pass& pass, const DrawCreateInfo& info);
 void ScheduleDraws(RenderContext& renderContext, const std::unordered_map<DrawKey, std::vector<Draw>>& drawData, const DrawKey& key, vk::CommandBuffer commandBuffer);
 } // namespace gore::renderer

src/Rendering/DrawStream/DrawStream.cpp

@@ -150,7 +150,7 @@ void CreateDrawStreamFromDrawData(const std::vector<Draw>& drawData, DrawStream&
     drawStream.data.assign(writer.GetData(), writer.GetData() + writer.GetByteWritten());
 }
 
-void ScheduleDrawStream(RenderContext& renderContext, DrawStream& drawStream, vk::CommandBuffer commandBuffer)
+void ScheduleDrawStream(RenderContext& renderContext, DrawStream& drawStream, vk::CommandBuffer commandBuffer, GraphicsPipelineHandle overridePipeline)
 {
     BitReader reader(drawStream.data.data(), drawStream.data.size());
 
@@ -170,7 +170,7 @@ void ScheduleDrawStream(RenderContext& renderContext, DrawStream& drawStream, vk
 
         if (mask.shader != 0)
         {
-            auto shaderHandle = reader.Read<GraphicsPipelineHandle>();
+            auto shaderHandle = overridePipeline.empty() ? reader.Read<GraphicsPipelineHandle>() : overridePipeline;
             graphicsPipeline  = renderContext.GetGraphicsPipeline(shaderHandle);
             commandBuffer.bindPipeline(vk::PipelineBindPoint::eGraphics, graphicsPipeline.pipeline);
         }

src/Rendering/DrawStream/DrawStream.h

@@ -39,5 +39,5 @@ struct DrawStream final
 };
 
 void CreateDrawStreamFromDrawData(const std::vector<Draw>& drawData, DrawStream& drawStream);
-void ScheduleDrawStream(RenderContext& renderContext, DrawStream& drawStream, vk::CommandBuffer commandBuffer);
+void ScheduleDrawStream(RenderContext& renderContext, DrawStream& drawStream, vk::CommandBuffer commandBuffer, GraphicsPipelineHandle overridePipeline = {});
 } // namespace gore::renderer