From b8dc35bd8a8bf56820e5dc9d62ef7751bdb50908 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Mon, 1 Nov 2021 16:35:33 -0700 Subject: [PATCH 1/7] Add NativePerformanceLogger --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 3 +++ Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt | 1 + Modules/@babylonjs/react-native/android/CMakeLists.txt | 1 + Modules/@babylonjs/react-native/ios/CMakeLists.txt | 1 + Modules/@babylonjs/react-native/react-native-babylon.podspec | 1 + Modules/@babylonjs/react-native/shared/BabylonNative.cpp | 2 ++ Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- Package/gulpfile.js | 1 + Package/iOS/CMakeLists.txt | 1 + 9 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index 1d4f6178a..f41a9e27e 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -144,6 +144,7 @@ $(BabylonNativeBuildDir)\Plugins\NativeEngine\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeInput\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeOptimizations\$(Configuration); + $(BabylonNativeBuildDir)\Plugins\NativePerformanceLogger\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeXr\$(Configuration); $(BabylonNativeBuildDir)\Polyfills\Window\$(Configuration); $(BabylonNativeBuildDir)\Polyfills\XMLHttpRequest\$(Configuration); @@ -191,6 +192,7 @@ NativeEngine.lib; NativeInput.lib; NativeOptimizations.lib; + NativePerformanceLogger.lib; NativeXr.lib; nvtt.lib; OGLCompilerd.lib; @@ -249,6 +251,7 @@ NativeEngine.lib; NativeInput.lib; NativeOptimizations.lib; + NativePerformanceLogger.lib; NativeXr.lib; nvtt.lib; OGLCompiler.lib; diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index a6ac019b5..10582102b 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -43,6 +43,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations + NativePerformanceLogger NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/android/CMakeLists.txt b/Modules/@babylonjs/react-native/android/CMakeLists.txt index 4d02ba107..fd3fec56a 100644 --- a/Modules/@babylonjs/react-native/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/android/CMakeLists.txt @@ -79,6 +79,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations + NativePerformanceLogger NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/ios/CMakeLists.txt b/Modules/@babylonjs/react-native/ios/CMakeLists.txt index 90d06ee4b..8157a92b0 100644 --- a/Modules/@babylonjs/react-native/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/ios/CMakeLists.txt @@ -57,6 +57,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations + NativePerformanceLogger NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/react-native-babylon.podspec b/Modules/@babylonjs/react-native/react-native-babylon.podspec index a55e242f8..68b2dc9d2 100644 --- a/Modules/@babylonjs/react-native/react-native-babylon.podspec +++ b/Modules/@babylonjs/react-native/react-native-babylon.podspec @@ -35,6 +35,7 @@ Pod::Spec.new do |s| 'NativeEngine', 'NativeInput', 'NativeOptimizations', + 'NativePerformanceLogger', 'NativeXR', 'SPIRV', 'spirv-cross-core', diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index 04ceb48f9..0b6a0fa13 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,7 @@ namespace Babylon Plugins::NativeCapture::Initialize(m_env); m_nativeInput = &Plugins::NativeInput::CreateForJavaScript(m_env); Plugins::NativeOptimizations::Initialize(m_env); + Plugins::NativePerformanceLogger::Initialize(m_env); // Initialize Babylon Native polyfills Polyfills::Window::Initialize(m_env); diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index d7791ffc7..17fac9b76 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit d7791ffc7b6b85ae6de87bd4d963fd5e312350fd +Subproject commit 17fac9b765c8c2136bb25521ba5bb345efb78040 diff --git a/Package/gulpfile.js b/Package/gulpfile.js index b1187e7bd..7fe0be2db 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -473,6 +473,7 @@ const validate = async () => { 'Assembled/ios/libs/libNativeEngine.a', 'Assembled/ios/libs/libNativeInput.a', 'Assembled/ios/libs/libNativeOptimizations.a', + 'Assembled/ios/libs/libNativePerformanceLogger.a', 'Assembled/ios/libs/libNativeXr.a', 'Assembled/ios/libs/libOGLCompiler.a', 'Assembled/ios/libs/libOSDependent.a', diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index 41e278251..a345c78ae 100644 --- a/Package/iOS/CMakeLists.txt +++ b/Package/iOS/CMakeLists.txt @@ -21,6 +21,7 @@ set(PACKAGED_LIBS NativeEngine NativeInput NativeOptimizations + NativePerformanceLogger NativeXr SPIRV spirv-cross-core From 1fdfe8fe2f31b7d223bdd0cb2281bf60112942cd Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Mon, 1 Nov 2021 16:38:18 -0700 Subject: [PATCH 2/7] Update BabylonNative to the latest --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 17fac9b76..747bc9eb3 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 17fac9b765c8c2136bb25521ba5bb345efb78040 +Subproject commit 747bc9eb351bdbd01d84b7ac080f24de2f5636d3 From 5809c68279b22cdeaffad6156db9f95ea80634e6 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Tue, 2 Nov 2021 16:40:49 -0700 Subject: [PATCH 3/7] Fix compile errors --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 747bc9eb3..d8593a1f7 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 747bc9eb351bdbd01d84b7ac080f24de2f5636d3 +Subproject commit d8593a1f7b21de27d6d3ef9706a74ba4ede6305f From 7074860d573e7773fde98379625ea212bc03326f Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Wed, 3 Nov 2021 15:59:44 -0700 Subject: [PATCH 4/7] Rename NativePerformanceLogging to NativeTracing --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 6 +++--- .../@babylonjs/react-native-windows/windows/CMakeLists.txt | 2 +- Modules/@babylonjs/react-native/android/CMakeLists.txt | 2 +- Modules/@babylonjs/react-native/ios/CMakeLists.txt | 2 +- .../@babylonjs/react-native/react-native-babylon.podspec | 2 +- Modules/@babylonjs/react-native/shared/BabylonNative.cpp | 4 ++-- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- Package/gulpfile.js | 2 +- Package/iOS/CMakeLists.txt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index f41a9e27e..9d85dd1db 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -144,7 +144,7 @@ $(BabylonNativeBuildDir)\Plugins\NativeEngine\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeInput\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeOptimizations\$(Configuration); - $(BabylonNativeBuildDir)\Plugins\NativePerformanceLogger\$(Configuration); + $(BabylonNativeBuildDir)\Plugins\NativeTracing\$(Configuration); $(BabylonNativeBuildDir)\Plugins\NativeXr\$(Configuration); $(BabylonNativeBuildDir)\Polyfills\Window\$(Configuration); $(BabylonNativeBuildDir)\Polyfills\XMLHttpRequest\$(Configuration); @@ -192,7 +192,7 @@ NativeEngine.lib; NativeInput.lib; NativeOptimizations.lib; - NativePerformanceLogger.lib; + NativeTracing.lib; NativeXr.lib; nvtt.lib; OGLCompilerd.lib; @@ -251,7 +251,7 @@ NativeEngine.lib; NativeInput.lib; NativeOptimizations.lib; - NativePerformanceLogger.lib; + NativeTracing.lib; NativeXr.lib; nvtt.lib; OGLCompiler.lib; diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt index 10582102b..4ba115709 100644 --- a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt +++ b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt @@ -43,7 +43,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations - NativePerformanceLogger + NativeTracing NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/android/CMakeLists.txt b/Modules/@babylonjs/react-native/android/CMakeLists.txt index fd3fec56a..f1c9f285c 100644 --- a/Modules/@babylonjs/react-native/android/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/android/CMakeLists.txt @@ -79,7 +79,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations - NativePerformanceLogger + NativeTracing NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/ios/CMakeLists.txt b/Modules/@babylonjs/react-native/ios/CMakeLists.txt index 8157a92b0..c0874cea6 100644 --- a/Modules/@babylonjs/react-native/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/ios/CMakeLists.txt @@ -57,7 +57,7 @@ target_link_libraries(BabylonNative NativeEngine NativeInput NativeOptimizations - NativePerformanceLogger + NativeTracing NativeXr Window XMLHttpRequest diff --git a/Modules/@babylonjs/react-native/react-native-babylon.podspec b/Modules/@babylonjs/react-native/react-native-babylon.podspec index 68b2dc9d2..83224db9b 100644 --- a/Modules/@babylonjs/react-native/react-native-babylon.podspec +++ b/Modules/@babylonjs/react-native/react-native-babylon.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| 'NativeEngine', 'NativeInput', 'NativeOptimizations', - 'NativePerformanceLogger', + 'NativeTracing', 'NativeXR', 'SPIRV', 'spirv-cross-core', diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index 0b6a0fa13..2d0cca0f9 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include @@ -51,7 +51,7 @@ namespace Babylon Plugins::NativeCapture::Initialize(m_env); m_nativeInput = &Plugins::NativeInput::CreateForJavaScript(m_env); Plugins::NativeOptimizations::Initialize(m_env); - Plugins::NativePerformanceLogger::Initialize(m_env); + Plugins::NativeTracing::Initialize(m_env); // Initialize Babylon Native polyfills Polyfills::Window::Initialize(m_env); diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index d8593a1f7..04ee211f6 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit d8593a1f7b21de27d6d3ef9706a74ba4ede6305f +Subproject commit 04ee211f6c0080766e01779af2473c13eee19f90 diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 7fe0be2db..b8f877a46 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -473,7 +473,7 @@ const validate = async () => { 'Assembled/ios/libs/libNativeEngine.a', 'Assembled/ios/libs/libNativeInput.a', 'Assembled/ios/libs/libNativeOptimizations.a', - 'Assembled/ios/libs/libNativePerformanceLogger.a', + 'Assembled/ios/libs/libNativeTracing.a', 'Assembled/ios/libs/libNativeXr.a', 'Assembled/ios/libs/libOGLCompiler.a', 'Assembled/ios/libs/libOSDependent.a', diff --git a/Package/iOS/CMakeLists.txt b/Package/iOS/CMakeLists.txt index a345c78ae..37f7740cf 100644 --- a/Package/iOS/CMakeLists.txt +++ b/Package/iOS/CMakeLists.txt @@ -21,7 +21,7 @@ set(PACKAGED_LIBS NativeEngine NativeInput NativeOptimizations - NativePerformanceLogger + NativeTracing NativeXr SPIRV spirv-cross-core From c426d9bca2aac6c919b866c8ba636952bd9ee295 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Wed, 3 Nov 2021 16:55:17 -0700 Subject: [PATCH 5/7] Add move assignment operator --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 04ee211f6..9056dd542 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 04ee211f6c0080766e01779af2473c13eee19f90 +Subproject commit 9056dd542f804b988e8e312de1ec482378e1268d From 58c45e3b11e8dd20b1fa3b93df5db0130c1b6002 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Wed, 3 Nov 2021 16:59:58 -0700 Subject: [PATCH 6/7] Fix trace_region var names --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 9056dd542..fc2b37aa3 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 9056dd542f804b988e8e312de1ec482378e1268d +Subproject commit fc2b37aa3984e62337f0361fc68d3283dbebd93e From 296e331612697f204c70ac648276e105f0d79bf6 Mon Sep 17 00:00:00 2001 From: Ryan Tremblay Date: Thu, 4 Nov 2021 10:43:02 -0700 Subject: [PATCH 7/7] Update BabylonNative commit to master --- Modules/@babylonjs/react-native/submodules/BabylonNative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index fc2b37aa3..8ac940fab 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit fc2b37aa3984e62337f0361fc68d3283dbebd93e +Subproject commit 8ac940fabdd0752035caa9880426bca0556ba518