Canvas cleanup fix integration (#292)

* Integrate canvas based text resource flush * Update BabylonNative to take VertexBuffer fix
BabylonJS · Oct 12, 2021 · a470e78 · a470e78
1 parent 869d850
commit a470e78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp
@@ -22,6 +22,7 @@ namespace Babylon
     {
         Dispatcher g_inlineDispatcher{ [](const std::function<void()>& func) { func(); } };
         std::unique_ptr<Graphics> g_graphics{};
+        std::unique_ptr<Babylon::Polyfills::Canvas> g_nativeCanvas{};
     }
 
     const uint32_t LEFT_MOUSE_BUTTON_ID{ NativeInput::LEFT_MOUSE_BUTTON_ID };
@@ -58,7 +59,7 @@ namespace Babylon
             Polyfills::XMLHttpRequest::Initialize(m_env);
 
             // Initialize Canvas polyfill for text support
-            Polyfills::Canvas::Initialize(m_env);
+            g_nativeCanvas = std::make_unique<Babylon::Polyfills::Canvas>(Babylon::Polyfills::Canvas::Initialize(m_env));
         }
 
         ~ReactNativeModule() override
@@ -117,6 +118,7 @@ namespace Babylon
         {
             if (g_graphics)
             {
+                g_nativeCanvas->FlushGraphicResources();
                 g_graphics->DisableRendering();
 
                 m_jsDispatcher([this]()

diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative
+0 −1		Core/AppRuntime/Source/WorkQueue.cpp
+27 −14		Core/AppRuntime/Source/WorkQueue.h
+0 −2		Dependencies/napi/napi-direct/source/js_native_api_chakra.cc
+2 −2		Plugins/NativeEngine/Source/VertexArray.cpp
+4 −14		Plugins/NativeEngine/Source/VertexBuffer.cpp
+1 −1		Plugins/NativeEngine/Source/VertexBuffer.h
+12 −13		Polyfills/XMLHttpRequest/Source/XMLHttpRequest.cpp
+1 −1		Polyfills/XMLHttpRequest/Source/XMLHttpRequest.h