Skip to content

Update BabylonNative submodule #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 27, 2021
Merged

Update BabylonNative submodule #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7904dab
update BabylonNative submodule
CedricGuillemetMS Apr 26, 2021
7bbc75a
PCH off for glslang
CedricGuillemetMS Apr 26, 2021
77c104b
pch off
CedricGuillemetMS Apr 26, 2021
42cde1a
removed empty line
CedricGuillemetMS Apr 26, 2021
5ac19d6
spirv debug libraries name suffix
CedricGuillemetMS Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...les/@babylonjs/react-native-windows/windows/BabylonReactNative/BabylonReactNative.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions Modules/@babylonjs/react-native/shared/BabylonNative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ namespace Babylon

void UpdateView(void* windowPtr, size_t width, size_t height)
{
GraphicsConfiguration graphicsConfig{};
graphicsConfig.WindowPtr = reinterpret_cast<WindowType>(windowPtr);
graphicsConfig.Width = width;
graphicsConfig.Height = height;
WindowConfiguration windowConfig{};
windowConfig.WindowPtr = reinterpret_cast<WindowType>(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);
}

Expand Down
2 changes: 1 addition & 1 deletion Modules/@babylonjs/react-native/submodules/BabylonNative
Open in desktop
Submodule BabylonNative updated 114 files
2 changes: 1 addition & 1 deletion Package/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down