Merge pull request #103 from Legacy-LuaSTG-Engine/dev/swap-chain-code-review

[dev] SwapChain code review

Author: Demonese

engine/graphics/common/PrimitiveBatchRenderer.cpp

@@ -1,10 +1,27 @@
 #include "common/PrimitiveBatchRenderer.hpp"
 
 namespace core {
+    void PrimitiveBatchRenderer::onGraphicsDeviceCreate() {
+        // nothing
+    }
+    void PrimitiveBatchRenderer::onGraphicsDeviceDestroy() {
+        if (m_initialized && m_batch_scope) {
+            mapBuffers(false);
+        }
+    }
+
     PrimitiveBatchRenderer::PrimitiveBatchRenderer() = default;
-    PrimitiveBatchRenderer::~PrimitiveBatchRenderer() = default;
+    PrimitiveBatchRenderer::~PrimitiveBatchRenderer() {
+        if (m_initialized) {
+            m_device->removeEventListener(this);
+        }
+    }
 
     bool PrimitiveBatchRenderer::createResources(IGraphicsDevice* const device) {
+        if (m_initialized && m_device) {
+            m_device->removeEventListener(this);
+        }
+
         if (device == nullptr) {
             assert(false); return false;
         }
@@ -20,10 +37,14 @@ namespace core {
             return false;
         }
 
+        m_device->addEventListener(this);
         m_initialized = true;
         return true;
     }
 
+    bool PrimitiveBatchRenderer::isBatch() const noexcept {
+        return m_batch_scope;
+    }
     bool PrimitiveBatchRenderer::beginBatch(const bool auto_draw) {
         if (m_batch_scope) {
             assert(false); return false;

engine/graphics/common/PrimitiveBatchRenderer.hpp

@@ -4,11 +4,14 @@
 #include "core/SmartReference.hpp"
 
 namespace core {
-    class PrimitiveBatchRenderer {
+    class PrimitiveBatchRenderer : public IGraphicsDeviceEventListener {
     public:
         using DrawVertex = Graphics::IRenderer::DrawVertex;
         using DrawIndex = Graphics::IRenderer::DrawIndex;
 
+        void onGraphicsDeviceCreate() override;
+        void onGraphicsDeviceDestroy() override;
+
         PrimitiveBatchRenderer();
         PrimitiveBatchRenderer(const PrimitiveBatchRenderer&) = delete;
         PrimitiveBatchRenderer(PrimitiveBatchRenderer&&) = delete;
@@ -20,6 +23,8 @@ namespace core {
         // [free]
         bool createResources(IGraphicsDevice* device);
 
+        // [free]
+        bool isBatch() const noexcept;
         // [free]
         bool beginBatch(bool auto_draw);
         // [batch]

engine/graphics/core/Graphics/Renderer_D3D11.cpp

@@ -303,7 +303,9 @@ namespace core::Graphics {
 
 		if (discard) {
 			m_primitive_batch_renderer.discard();
-			m_primitive_batch_renderer.endBatch();
+			if (m_primitive_batch_renderer.isBatch()) {
+				m_primitive_batch_renderer.endBatch();
+			}
 			m_primitive_batch_renderer.setCycleOnNextBatch();
 			setTexture(_state_texture.get());
 			return true;

engine/graphics/d3d11/GraphicsPipeline.cpp

@@ -290,7 +290,12 @@ namespace core {
         }
         m_device = device;
         m_graphics_pipeline_state_helper.save(create_info);
-        return createResources();
+        if (!createResources()) {
+            return false;
+        }
+        m_device->addEventListener(this);
+        m_initialized = true;
+        return true;
     }
     void GraphicsPipeline::apply() {
         const auto ctx = static_cast<ID3D11DeviceContext*>(m_device->getCommandbuffer()->getNativeHandle());
@@ -403,8 +408,6 @@ namespace core {
             return false;
         }
 
-        m_device->addEventListener(this);
-        m_initialized = true;
         return true;
     }
 }