修复部分退出

Author: MaaBlock

src/Context/Context.cpp

@@ -163,6 +163,7 @@ namespace FCT {
 
     Context::~Context() {
         m_ctxRunning = false;
+        FCT_SAFE_DELETE(m_renderGraph);
         m_submitThread.join();
     }
 

src/Context/Context.h

@@ -199,7 +199,7 @@ namespace FCT
 		}
 		constexpr inline void _waitForNextFrame()
 		{
-			FCT_WAIT_FOR(m_nextFrame);
+			FCT_WAIT_FOR_WITH_TERM(m_nextFrame,!m_ctxRunning);
 		}
 		void advanceLogicFrame()
 		{

src/Context/RenderGraph.cpp

@@ -105,6 +105,16 @@ namespace FCT
         syncTickers.update();
     }
 
+    RenderGraph::~RenderGraph()
+    {
+        auto& syncTickers = m_flowControl->syncTickers();
+        syncTickers.removeNode(RenderGraphTickers::CheckRecompiledSync);
+        syncTickers.update();
+        auto& submitGraph = m_flowControl->submitTickers();
+        submitGraph.removeNode(RenderGraphTickers::RenderGraphSubmit);
+        submitGraph.update();
+    }
+
     RenderGraphImageNode* RenderGraph::getOrCreateImageNode(const std::string& name, const Texture& texture)
     {
         auto it = m_imageNodes.find(name);

src/Context/RenderGraph.h

@@ -299,6 +299,7 @@ namespace FCT
     public:
         RenderGraph(PipeHub& pipeHub, Device* device, FlowControl* flowControl, CommandBufferGraph* commandBufferGraph,
                     ResourceManager* resourceManager);
+        ~RenderGraph();
         void recompile();
         std::vector<PassDesc> getOriginalPasses() const
         {

src/ToolDefine.h

@@ -8,10 +8,18 @@
 //#define FCT_SAFE_ADDREF(p) if (p) { p->addRef(); }
 #define FCT_WAIT_FOR(condition) \
     do { \
-        while(!condition) \
+        while(!(condition)) \
         {\
             std::this_thread::sleep_for(std::chrono::milliseconds(0)); \
         }\
         condition = false;\
     } while(0)
+#define FCT_WAIT_FOR_WITH_TERM(condition,termCondition) \
+    do { \
+        while(!condition && !(termCondition)) \
+        {\
+            std::this_thread::sleep_for(std::chrono::milliseconds(0)); \
+        }\
+    condition = false;\
+    } while(0)
 #endif //FCT_TOOLDEFINE_H