From 7904dab2370b6151170271e7858909ba8fdf6f0c Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 26 Apr 2021 14:06:03 +0200 Subject: [PATCH 1/5] update BabylonNative submodule --- .../@babylonjs/react-native/shared/BabylonNative.cpp | 12 ++++++------ .../@babylonjs/react-native/submodules/BabylonNative | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp index fb6a1c88e..89e294cf8 100644 --- a/Modules/@babylonjs/react-native/shared/BabylonNative.cpp +++ b/Modules/@babylonjs/react-native/shared/BabylonNative.cpp @@ -63,18 +63,18 @@ namespace Babylon void UpdateView(void* windowPtr, size_t width, size_t height) { - GraphicsConfiguration graphicsConfig{}; - graphicsConfig.WindowPtr = reinterpret_cast(windowPtr); - graphicsConfig.Width = width; - graphicsConfig.Height = height; + WindowConfiguration windowConfig{}; + windowConfig.WindowPtr = reinterpret_cast(windowPtr); + windowConfig.Width = width; + windowConfig.Height = height; if (!g_graphics) { - g_graphics = Graphics::CreateGraphics(graphicsConfig); + g_graphics = Graphics::CreateGraphics(windowConfig); } else { - g_graphics->UpdateWindow(graphicsConfig); + g_graphics->UpdateWindow(windowConfig); g_graphics->UpdateSize(width, height); } diff --git a/Modules/@babylonjs/react-native/submodules/BabylonNative b/Modules/@babylonjs/react-native/submodules/BabylonNative index 2a7e5394e..12160f08a 160000 --- a/Modules/@babylonjs/react-native/submodules/BabylonNative +++ b/Modules/@babylonjs/react-native/submodules/BabylonNative @@ -1 +1 @@ -Subproject commit 2a7e5394ea6b76dbde80fa6a7aa572b488484e97 +Subproject commit 12160f08a6c6025b0d6a458648321b731844976b From 7bbc75a6f22c8dc99a15a68ce462e1841bc1ea4b Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 26 Apr 2021 17:01:12 +0200 Subject: [PATCH 2/5] PCH off for glslang --- Modules/@babylonjs/react-native/ios/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/@babylonjs/react-native/ios/CMakeLists.txt b/Modules/@babylonjs/react-native/ios/CMakeLists.txt index 66542e526..b89392897 100644 --- a/Modules/@babylonjs/react-native/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/ios/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.13.2) project(ReactNativeBabylon) + +add_definitions(-DENABLE_PCH=OFF) include(${CMAKE_CURRENT_LIST_DIR}/../shared/CMakeLists.txt) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") From 77c104b85eed5308df6bf17d2268d2682d5c8ca4 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 26 Apr 2021 17:46:45 +0200 Subject: [PATCH 3/5] pch off --- Modules/@babylonjs/react-native/ios/CMakeLists.txt | 1 - Package/gulpfile.js | 2 +- README.md | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Modules/@babylonjs/react-native/ios/CMakeLists.txt b/Modules/@babylonjs/react-native/ios/CMakeLists.txt index b89392897..e634ce98a 100644 --- a/Modules/@babylonjs/react-native/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/ios/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.13.2) project(ReactNativeBabylon) -add_definitions(-DENABLE_PCH=OFF) include(${CMAKE_CURRENT_LIST_DIR}/../shared/CMakeLists.txt) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") diff --git a/Package/gulpfile.js b/Package/gulpfile.js index fc604a4a5..a41433e16 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -29,7 +29,7 @@ const clean = async () => { const makeXCodeProj = async () => { shelljs.mkdir('-p', 'iOS/Build'); - exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF ..', 'iOS/Build'); + exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../../../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF -DENABLE_PCH=OFF ..', 'iOS/Build'); }; const buildIphoneOS = async () => { diff --git a/README.md b/README.md index 88ed85eba..410cac9dc 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ iOS can only be built on a Mac. Additionally, `CMake` must manually be run to ge ``` pushd Apps/Playground/node_modules/@babylonjs/react-native/ios -cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF . +cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_GLSLANG_BINARIES=OFF -DSPIRV_CROSS_CLI=OFF -DENABLE_PCH=OFF . popd cd Apps/Playground From 42cde1a5a00aa9f01b7f38c02885f03147728902 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 26 Apr 2021 18:07:36 +0200 Subject: [PATCH 4/5] removed empty line --- Modules/@babylonjs/react-native/ios/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/@babylonjs/react-native/ios/CMakeLists.txt b/Modules/@babylonjs/react-native/ios/CMakeLists.txt index e634ce98a..66542e526 100644 --- a/Modules/@babylonjs/react-native/ios/CMakeLists.txt +++ b/Modules/@babylonjs/react-native/ios/CMakeLists.txt @@ -1,6 +1,5 @@ cmake_minimum_required(VERSION 3.13.2) project(ReactNativeBabylon) - include(${CMAKE_CURRENT_LIST_DIR}/../shared/CMakeLists.txt) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") From 5ac19d6018d4d9fa435483b8d689204659e103d7 Mon Sep 17 00:00:00 2001 From: Cedric Guillemet Date: Mon, 26 Apr 2021 18:17:37 +0200 Subject: [PATCH 5/5] spirv debug libraries name suffix --- .../windows/BabylonReactNative/BabylonReactNative.vcxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj index f8e8f2ce6..dcb23c50a 100644 --- a/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj +++ b/Modules/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj @@ -195,9 +195,9 @@ openxr_loaderd.lib; OSDependentd.lib; pvrtc.lib; - spirv-cross-core.lib; - spirv-cross-glsl.lib; - spirv-cross-hlsl.lib; + spirv-cross-cored.lib; + spirv-cross-glsld.lib; + spirv-cross-hlsld.lib; SPIRVd.lib; squish.lib; UrlLib.lib;