@babylonjs/react-native 2.0.0 → 2.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@babylonjs/react-native",
     "title": "React Native Babylon",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "Babylon Native integration into React Native",
     "main": "index.js",
     "scripts": {

package/react-native-babylon.podspec

@@ -23,6 +23,7 @@ items = ['/shared/BabylonNative/Repo/Polyfills/Canvas',
   '/shared/BabylonNative/Repo/Plugins/ShaderCompiler',
   '/shared/BabylonNative/Repo/Core/Graphics',
   '/shared/BabylonNative/Repo/Dependencies/xr', 
+  '/shared/BabylonNative/Repo/Dependencies',
   '/_deps/bgfx.cmake-build/cmake/bgfx',
   '/_deps/bgfx.cmake-build/cmake/bimg',
   '/_deps/bgfx.cmake-build/cmake/bx',
@@ -103,6 +104,7 @@ Pod::Spec.new do |s|
           'ShaderCache',
           'ShaderCompiler',
           'webp',
+          'metal-cpp',
           'sharpyuv']
 
   if ENV['BABYLON_NATIVE_PLUGIN_NATIVECAMERA'] != '0'

package/shared/BabylonNative/CMakeLists.txt

@@ -3,6 +3,7 @@ set(BABYLON_NATIVE_BUILD_APPS OFF)
 set(BABYLON_NATIVE_INSTALL OFF)
 set(BABYLON_NATIVE_PLUGIN_TESTUTILS OFF)
 set(BABYLON_NATIVE_USE_WINDOWS_APP_SDK OFF)
+set(BABYLON_NATIVE_DISABLE_WEBMIN ON)
 set(FETCHCONTENT_SOURCE_DIR_BGFX.CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/deps/bgfx.cmake-src")
 set(FETCHCONTENT_SOURCE_DIR_ARCANA.CPP "${CMAKE_CURRENT_SOURCE_DIR}/deps/arcana.cpp-src")
 set(FETCHCONTENT_SOURCE_DIR_CMAKEEXTENSIONS "${CMAKE_CURRENT_SOURCE_DIR}/deps/cmakeextensions-src")
@@ -16,5 +17,6 @@ set(FETCHCONTENT_SOURCE_DIR_IOS-CMAKE "${CMAKE_CURRENT_SOURCE_DIR}/deps/ios-cmak
 set(FETCHCONTENT_SOURCE_DIR_ARCORE-ANDROID-SDK "${CMAKE_CURRENT_SOURCE_DIR}/deps/arcore-android-sdk-src")
 set(FETCHCONTENT_SOURCE_DIR_ANDROIDEXTENSIONS "${CMAKE_CURRENT_SOURCE_DIR}/deps/androidextensions-src")
 set(FETCHCONTENT_SOURCE_DIR_GSL "${CMAKE_CURRENT_SOURCE_DIR}/deps/gsl-src")
+set(FETCHCONTENT_SOURCE_DIR_METAL-CPP "${CMAKE_CURRENT_SOURCE_DIR}/deps/metal-cpp-src")
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Repo)

package/shared/BabylonNative/Repo/CMakeLists.txt

@@ -23,7 +23,7 @@ FetchContent_Declare(AndroidExtensions
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(arcana.cpp
     GIT_REPOSITORY https://github.com/microsoft/arcana.cpp.git
-    GIT_TAG c02527c32d51b6b3ffeda36f8cf140d2e1c60bb9
+    GIT_TAG 53e5b05eaf53154b60dff8ffb45e52a417cf5020
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(arcore-android-sdk
     GIT_REPOSITORY https://github.com/google-ar/arcore-android-sdk.git
@@ -35,11 +35,11 @@ FetchContent_Declare(base-n
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(bgfx.cmake
     GIT_REPOSITORY https://github.com/BabylonJS/bgfx.cmake.git
-    GIT_TAG 0af3c9865a66aff1748a51bb466b24f05a123043
+    GIT_TAG 1b10ed55fadc0171c736f9638514ae715a1d97de
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(CMakeExtensions
     GIT_REPOSITORY https://github.com/BabylonJS/CMakeExtensions.git
-    GIT_TAG ea28b7689530bfdc4905806f27ecf7e8ed4b5419
+    GIT_TAG 631780e42886e5f12bfd1a5568c7395f1d657f43 
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(glslang
     GIT_REPOSITORY https://github.com/BabylonJS/glslang.git
@@ -54,15 +54,19 @@ FetchContent_Declare(ios-cmake
     EXCLUDE_FROM_ALL)
 FetchContent_Declare(JsRuntimeHost
     GIT_REPOSITORY https://github.com/BabylonJS/JsRuntimeHost.git
-    GIT_TAG 06d4420e92f9555b5356071444cd13767d3e4eb8)
-FetchContent_Declare(SPIRV-Cross
-    GIT_REPOSITORY https://github.com/BabylonJS/SPIRV-Cross.git
-    GIT_TAG 6277baf62877f6b1a66a5801da94f0c9276991dc
-    EXCLUDE_FROM_ALL)
+    GIT_TAG a7bcbd4bcd0d92e2ef05a92daf490298fde74ead)
 FetchContent_Declare(libwebp
     GIT_REPOSITORY https://github.com/webmproject/libwebp.git
     GIT_TAG 57e324e2eb99be46df46d77b65705e34a7ae616c
     EXCLUDE_FROM_ALL)
+FetchContent_Declare(metal-cpp
+    GIT_REPOSITORY https://github.com/bkaradzic/metal-cpp.git
+    GIT_TAG metal-cpp_26
+    EXCLUDE_FROM_ALL)
+FetchContent_Declare(SPIRV-Cross
+    GIT_REPOSITORY https://github.com/BabylonJS/SPIRV-Cross.git
+    GIT_TAG 0e1654748e9e54b5469fb0fbc1c715b96fa06f8f
+    EXCLUDE_FROM_ALL)
 
 # --------------------------------------------------
 
@@ -95,9 +99,12 @@ project(BabylonNative)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Suppress "Performing Test ..." output from check_c_compiler_flag() and similar macros.
+set(CMAKE_REQUIRED_QUIET TRUE)
+
 # --------------------------------------------------
 # Options
 # --------------------------------------------------
@@ -218,9 +225,6 @@ if(MSVC)
 endif()
 
 if(APPLE)
-    # Without this option on azure pipelines, there is a mismatch with math.h giving a lot of undefined functions on macOS.
-    # Only enabled for Apple as there is no issue for Windows.
-    set(CMAKE_NO_SYSTEM_FROM_IMPORTED TRUE)
     # Create scheme for installation and other targets
     set(CMAKE_XCODE_GENERATE_SCHEME TRUE)
 endif()

package/shared/BabylonNative/Repo/Core/Graphics/CMakeLists.txt

@@ -15,7 +15,7 @@ set(SOURCES
     "Source/DeviceImpl.cpp"
     "Source/DeviceImpl.h"
     "Source/DeviceImpl_${BABYLON_NATIVE_PLATFORM}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}"
-    "Source/DeviceImpl_${GRAPHICS_API}.cpp"
+    "Source/DeviceImpl_${GRAPHICS_API}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}"
     "Source/SafeTimespanGuarantor.cpp"
     "Source/Texture.cpp")
 
@@ -28,6 +28,22 @@ target_include_directories(Graphics
     PRIVATE "Include/RendererType/${GRAPHICS_API}"
     PRIVATE "InternalInclude")
 
+target_compile_definitions(Graphics
+    PRIVATE NOMINMAX)
+
+# TODO: remove this once the #define in GraphicsImpl is removed
+target_compile_definitions(Graphics
+    PRIVATE $<UPPER_CASE:${GRAPHICS_API}>)
+
+target_link_libraries(Graphics
+    PRIVATE JsRuntimeInternal
+    PRIVATE bgfx
+    PRIVATE bimg
+    PRIVATE bimg_encode
+    PRIVATE bimg_decode
+    PRIVATE minz
+    PRIVATE bx)
+
 if(WINDOWS_STORE)
     target_link_libraries(Graphics
         PRIVATE WindowsAppSDK)
@@ -38,47 +54,46 @@ elseif(ANDROID)
     target_link_libraries(Graphics
         PRIVATE android
         PRIVATE AndroidExtensions)
+elseif(APPLE)
+    target_link_libraries(Graphics
+        PRIVATE metal-cpp)
 endif()
 
-target_link_libraries(Graphics
-    PRIVATE JsRuntimeInternal
-    PRIVATE bgfx
-    PRIVATE bimg
-    PRIVATE bimg_encode
-    PRIVATE bimg_decode
-    PRIVATE minz
-    PRIVATE bx)
-
-target_compile_definitions(Graphics
-    PRIVATE NOMINMAX)
-
-# TODO: remove this once the #define in GraphicsImpl is removed
-target_compile_definitions(Graphics
-    PRIVATE $<UPPER_CASE:${GRAPHICS_API}>)
-
 set_property(TARGET Graphics PROPERTY FOLDER Core)
 set_property(TARGET Graphics PROPERTY UNITY_BUILD false)
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
 
-if(APPLE)
-    # compile as objc++
-    target_compile_options(Graphics PUBLIC "SHELL:-x objective-c++")
-endif()
+# --------------
+# GraphicsDevice
+# --------------
 
 add_library(GraphicsDevice INTERFACE)
+
 target_include_directories(GraphicsDevice
     INTERFACE "Include/Shared"
     INTERFACE "Include/Platform/${BABYLON_NATIVE_PLATFORM}"
     INTERFACE "Include/RendererType/${GRAPHICS_API}")
+
 target_link_libraries(GraphicsDevice
     INTERFACE Graphics
     INTERFACE JsRuntime)
 
+if(APPLE)
+    target_link_libraries(GraphicsDevice
+        INTERFACE metal-cpp)
+endif()
+
+# ---------------------
+# GraphicsDeviceContext
+# ---------------------
+
 add_library(GraphicsDeviceContext INTERFACE)
+
 target_include_directories(GraphicsDeviceContext
     INTERFACE "InternalInclude"
     INTERFACE "InternalInclude/${BABYLON_NATIVE_PLATFORM}")
+
 target_link_libraries(GraphicsDeviceContext
     INTERFACE Graphics
     INTERFACE JsRuntimeInternal
@@ -87,6 +102,11 @@ target_link_libraries(GraphicsDeviceContext
     INTERFACE bimg
     INTERFACE bx)
 
+if(APPLE)
+    target_link_libraries(GraphicsDeviceContext
+        INTERFACE metal-cpp)
+endif()
+
 target_compile_definitions(GraphicsDeviceContext
     INTERFACE NOMINMAX)
 

package/shared/BabylonNative/Repo/Core/Graphics/Include/Platform/iOS/Babylon/Graphics/Platform.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#import <MetalKit/MTKView.h>
+#include <Metal/Metal.hpp>
 
 namespace Babylon::Graphics
 {
-    using WindowT = MTKView*;
+    using WindowT = CA::MetalLayer*;
 }

package/shared/BabylonNative/Repo/Core/Graphics/Include/Platform/macOS/Babylon/Graphics/Platform.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#import <MetalKit/MTKView.h>
+#include <Metal/Metal.hpp>
 
 namespace Babylon::Graphics
 {
-    using WindowT = MTKView*;
+    using WindowT = CA::MetalLayer*;
 }

package/shared/BabylonNative/Repo/Core/Graphics/Include/Platform/visionOS/Babylon/Graphics/Platform.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#import <QuartzCore/CAMetalLayer.h>
+#include <Metal/Metal.hpp>
 
 namespace Babylon::Graphics
 {
-    using WindowT = CAMetalLayer*;
+    using WindowT = CA::MetalLayer*;
 }

package/shared/BabylonNative/Repo/Core/Graphics/Include/RendererType/Metal/Babylon/Graphics/RendererType.h

@@ -1,16 +1,16 @@
 #pragma once
 
-#include <MetalKit/MetalKit.h>
+#include <Metal/Metal.hpp>
 
 namespace Babylon::Graphics
 {
-    using DeviceT = id<MTLDevice>;
-    using TextureT = id<MTLTexture>;
-    using TextureFormatT = MTLPixelFormat;
+    using DeviceT = MTL::Device*;
+    using TextureT = MTL::Texture*;
+    using TextureFormatT = MTL::PixelFormat;
 
     struct PlatformInfo
     {
-        id<MTLDevice> Device;
-        id<MTLCommandQueue> CommandQueue;
+        MTL::Device* Device;
+        MTL::CommandQueue* CommandQueue;
     };
 }

package/shared/BabylonNative/Repo/Core/Graphics/InternalInclude/Babylon/Graphics/BgfxCallback.h

@@ -38,7 +38,7 @@ namespace Babylon::Graphics
         uint32_t cacheReadSize(uint64_t id) override;
         bool cacheRead(uint64_t id, void* data, uint32_t size) override;
         void cacheWrite(uint64_t id, const void* data, uint32_t size) override;
-        void screenShot(const char* filePath, uint32_t width, uint32_t height, uint32_t pitch, const void* data, uint32_t size, bool yflip) override;
+        void screenShot(const char* filePath, uint32_t width, uint32_t height, uint32_t pitch, bgfx::TextureFormat::Enum format, const void* data, uint32_t size, bool yflip) override;
         void captureBegin(uint32_t width, uint32_t height, uint32_t pitch, bgfx::TextureFormat::Enum format, bool yflip) override;
         void captureEnd() override;
         void captureFrame(const void* _data, uint32_t _size) override;

package/shared/BabylonNative/Repo/Core/Graphics/Source/BgfxCallback.cpp

@@ -4,6 +4,7 @@
 #include <bx/string.h>
 #include <cassert>
 #include <stdarg.h>
+#include <stdexcept>
 
 namespace Babylon::Graphics
 {
@@ -85,25 +86,47 @@ namespace Babylon::Graphics
     {
     }
 
-    void BgfxCallback::screenShot(const char* /*filePath*/, uint32_t width, uint32_t height, uint32_t pitch, const void* data, uint32_t /*size*/, bool yflip)
+    void BgfxCallback::screenShot(const char* /*filePath*/, uint32_t width, uint32_t height, uint32_t pitch, bgfx::TextureFormat::Enum format, const void* data, uint32_t /*size*/, bool yflip)
     {
         assert(!m_screenShotCallbacks.empty()); // addScreenShotCallback not called before doing the screenshot call on bgfx
 
         std::vector<uint8_t> array(width * height * 4); // do not use pitch to define output size because it's padded
         uint8_t* bitmap{array.data()};
 
-        for (uint32_t py = 0; py < height; py++)
+        if (format == bgfx::TextureFormat::BGRA8)
         {
-            const uint8_t* ptr = static_cast<const uint8_t*>(data) + (yflip ? (height - py - 1) : py) * pitch;
-            for (uint32_t px = 0; px < width; px++)
+            for (uint32_t py = 0; py < height; py++)
             {
-                // bgfx screenshot is BGRA
-                *bitmap++ = ptr[px * 4 + 2];
-                *bitmap++ = ptr[px * 4 + 1];
-                *bitmap++ = ptr[px * 4 + 0];
-                *bitmap++ = ptr[px * 4 + 3];
+                const uint8_t* ptr = static_cast<const uint8_t*>(data) + (yflip ? (height - py - 1) : py) * pitch;
+                for (uint32_t px = 0; px < width; px++)
+                {
+                    // bgfx screenshot is BGRA
+                    *bitmap++ = ptr[px * 4 + 2];
+                    *bitmap++ = ptr[px * 4 + 1];
+                    *bitmap++ = ptr[px * 4 + 0];
+                    *bitmap++ = ptr[px * 4 + 3];
+                }
             }
         }
+        else if (format == bgfx::TextureFormat::RGBA8)
+        {
+            for (uint32_t py = 0; py < height; py++)
+            {
+                const uint8_t* ptr = static_cast<const uint8_t*>(data) + (yflip ? (height - py - 1) : py) * pitch;
+                for (uint32_t px = 0; px < width; px++)
+                {
+                    // bgfx screenshot is RGBA
+                    *bitmap++ = ptr[px * 4 + 0];
+                    *bitmap++ = ptr[px * 4 + 1];
+                    *bitmap++ = ptr[px * 4 + 2];
+                    *bitmap++ = ptr[px * 4 + 3];
+                }
+            }
+        }
+        else
+        {
+            throw std::runtime_error{"Unsupported format for screenshot"};
+        }
 
         m_screenShotCallbacks.front()(std::move(array));
         m_screenShotCallbacks.pop();

package/shared/BabylonNative/Repo/Core/Graphics/Source/DeviceImpl.cpp

@@ -206,9 +206,11 @@ namespace Babylon::Graphics
             bgfx::renderFrame();
 
             // Initialize bgfx.
-            auto& init{m_state.Bgfx.InitState};
-            bgfx::setPlatformData(init.platformData);
-            bgfx::init(init);
+            const auto& init{m_state.Bgfx.InitState};
+            if (!bgfx::init(init))
+            {
+                throw std::runtime_error{"Failed to initialize bgfx."};
+            }
 
             m_state.Bgfx.Initialized = true;
             m_state.Bgfx.Dirty = false;
@@ -410,8 +412,8 @@ namespace Babylon::Graphics
         {
             bgfx::setPlatformData(m_state.Bgfx.InitState.platformData);
 
-            // Ensure bgfx rebinds all texture information.
-            bgfx::discard();
+            // Discard the whole frame.
+            bgfx::frame(BGFX_FRAME_DISCARD);
 
             auto& res = m_state.Bgfx.InitState.resolution;
             bgfx::reset(res.width, res.height, res.reset);

package/shared/BabylonNative/Repo/Core/Graphics/Source/{DeviceImpl_Metal.cpp → DeviceImpl_Metal.mm}

@@ -8,8 +8,9 @@ namespace Babylon::Graphics
     PlatformInfo DeviceImpl::GetPlatformInfo() const
     {
         auto internalData = bgfx::getInternalData();
-        id<MTLDevice> device = (id<MTLDevice>)internalData->context;
-        id<MTLCommandQueue> commandQueue = (id<MTLCommandQueue>)internalData->commandQueue;
-        return {device, commandQueue};
+        return {
+            reinterpret_cast<MTL::Device*>(internalData->context),
+            reinterpret_cast<MTL::CommandQueue*>(internalData->commandQueue),
+        };
     }
 }

package/shared/BabylonNative/Repo/Core/Graphics/Source/DeviceImpl_iOS.mm

@@ -2,6 +2,9 @@
 #include <Babylon/Graphics/Platform.h>
 #include "DeviceImpl.h"
 
+#import <QuartzCore/QuartzCore.h>
+#import <UIKit/UIKit.h>
+
 namespace Babylon::Graphics
 {
     void DeviceImpl::ConfigureBgfxPlatformData(bgfx::PlatformData& pd, WindowT window)
@@ -15,10 +18,9 @@ namespace Babylon::Graphics
 
     float DeviceImpl::GetDevicePixelRatio(WindowT window)
     {
-        // contentScaleFactor can return infinity if the view is not yet parented
-        // to a window hierarchy (and thus has no associated screen).
+        // contentsScale can return 0 if it hasn't been set yet.
         // Fallback to the scale from the main screen.
-        float scale = window.contentScaleFactor;
+        float scale = static_cast<float>(((CAMetalLayer*)window).contentsScale);
         if (std::isinf(scale) || scale <= 0)
         {
             scale = UIScreen.mainScreen.scale;

package/shared/BabylonNative/Repo/Core/Graphics/Source/DeviceImpl_macOS.mm

@@ -1,6 +1,10 @@
+#include <cmath>
 #include <Babylon/Graphics/Platform.h>
 #include "DeviceImpl.h"
 
+#import <AppKit/AppKit.h>
+#import <QuartzCore/QuartzCore.h>
+
 namespace Babylon::Graphics
 {
     void DeviceImpl::ConfigureBgfxPlatformData(bgfx::PlatformData& pd, WindowT window)
@@ -14,6 +18,11 @@ namespace Babylon::Graphics
 
     float DeviceImpl::GetDevicePixelRatio(WindowT window)
     {
-        return window.window.screen.backingScaleFactor;
+        float scale = static_cast<float>(((CAMetalLayer*)window).contentsScale);
+        if (std::isinf(scale) || scale <= 0)
+        {
+            scale = NSScreen.mainScreen.backingScaleFactor;
+        }
+        return scale;
     }
 }

package/shared/BabylonNative/Repo/Core/Graphics/Source/DeviceImpl_visionOS.mm

@@ -12,10 +12,8 @@ namespace Babylon::Graphics
     {
     }
 
-    float DeviceImpl::GetDevicePixelRatio(WindowT window)
+    float DeviceImpl::GetDevicePixelRatio(WindowT)
     {
-      BX_UNUSED(window);
-      CGFloat displayScale = [UITraitCollection currentTraitCollection].displayScale;
-      return displayScale;
+      return [UITraitCollection currentTraitCollection].displayScale;
     }
 }

package/shared/BabylonNative/Repo/Dependencies/CMakeLists.txt

@@ -37,6 +37,7 @@ set(BGFX_CUSTOM_TARGETS OFF)
 set(BGFX_INSTALL OFF)
 set(BGFX_OPENGL_USE_EGL ON)
 set(BGFX_USE_DEBUG_SUFFIX OFF)
+
 FetchContent_MakeAvailable_With_Message(bgfx.cmake)
 
 # Turn off debug annotations as it causes an access violation in D3D12.
@@ -50,6 +51,12 @@ target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_MIN_RESOURCE_COMMAND_BUFFER_
 target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_MIN_UNIFORM_BUFFER_SIZE=4096)
 target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_UNIFORM_BUFFER_RESIZE_THRESHOLD_SIZE=256)
 target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_UNIFORM_BUFFER_RESIZE_INCREMENT_SIZE=1024)
+target_compile_definitions(bgfx PUBLIC BGFX_PLATFORM_SUPPORTS_WGSL=0)
+target_compile_definitions(bgfx PUBLIC BGFX_PLATFORM_SUPPORTS_DXIL=0)
+
+# Temporary disable uniform debug.
+target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_DEBUG_UNIFORM=0)
+
 if(GRAPHICS_API STREQUAL "D3D11")
     target_compile_definitions(bgfx PRIVATE BGFX_CONFIG_RENDERER_DIRECT3D11=1)
 elseif(GRAPHICS_API STREQUAL "D3D12")
@@ -98,7 +105,14 @@ set(ENABLE_HLSL OFF)
 set(ENABLE_OPT OFF)
 set(ENABLE_CTEST OFF)
 set(SKIP_GLSLANG_INSTALL ON)
-set(ENABLE_GLSLANG_WEBMIN ON)
+# BABYLON_NATIVE_DISABLE_WEBMIN is used to disable WebMin in both glslang and SPIRV-Cross.
+# This flag should be removed when the code coverage in these library corresponds to exactly what we use in Babylon.js
+# and webGL2 glsl. 
+if(BABYLON_NATIVE_DISABLE_WEBMIN)
+    set(ENABLE_GLSLANG_WEBMIN OFF)
+else()
+    set(ENABLE_GLSLANG_WEBMIN ON)
+endif()
 set(ENABLE_GLSLANG_WEBMIN_DEVEL OFF)
 
 if(NOT TARGET glslang)
@@ -148,6 +162,52 @@ if(WIN32)
     set_property(TARGET UrlLib PROPERTY UNITY_BUILD false)
 endif()
 
+# --------------------------------------------------
+# metal-cpp
+# --------------------------------------------------
+if(APPLE OR BABYLON_NATIVE_BUILD_SOURCETREE)
+    FetchContent_MakeAvailable_With_Message(metal-cpp)
+endif()
+
+if(APPLE)
+    # Generate a single header.
+    find_package(Python3 REQUIRED COMPONENTS Interpreter)
+    set(METAL_CPP_GENERATED_DIR "${CMAKE_BINARY_DIR}/metal-cpp")
+    execute_process(
+        COMMAND ${Python3_EXECUTABLE}
+            "${metal-cpp_SOURCE_DIR}/SingleHeader/MakeSingleHeader.py"
+            "${metal-cpp_SOURCE_DIR}/Foundation/Foundation.hpp"
+            "${metal-cpp_SOURCE_DIR}/Metal/Metal.hpp"
+            "${metal-cpp_SOURCE_DIR}/QuartzCore/QuartzCore.hpp"
+            -o "${METAL_CPP_GENERATED_DIR}/Include/Metal/Metal.hpp"
+        RESULT_VARIABLE METAL_CPP_RESULT)
+    if(NOT METAL_CPP_RESULT EQUAL 0)
+        message(FATAL_ERROR "Failed to generate metal-cpp single header")
+    endif()
+
+    # Generate source that includes the single header with the necessary implementation defines.
+    file(WRITE "${METAL_CPP_GENERATED_DIR}/Source/Metal.cpp"
+        "#define NS_PRIVATE_IMPLEMENTATION\n"
+        "#define MTL_PRIVATE_IMPLEMENTATION\n"
+        "#define CA_PRIVATE_IMPLEMENTATION\n"
+        "#include <Metal/Metal.hpp>\n")
+
+    set(SOURCES
+        "${METAL_CPP_GENERATED_DIR}/Include/Metal/Metal.hpp"
+        "${METAL_CPP_GENERATED_DIR}/Source/Metal.cpp")
+
+    add_library(metal-cpp ${SOURCES})
+    target_include_directories(metal-cpp SYSTEM PUBLIC "${METAL_CPP_GENERATED_DIR}/Include")
+    target_link_libraries(metal-cpp
+        PRIVATE "-framework Foundation"
+        PRIVATE "-framework Metal"
+        PRIVATE "-framework QuartzCore")
+
+    source_group(TREE "${metal-cpp_SOURCE_DIR}" FILES ${METAL_CPP_HEADERS})
+    source_group(TREE "${METAL_CPP_GENERATED_DIR}" FILES ${SOURCES})
+    set_property(TARGET metal-cpp PROPERTY FOLDER Dependencies)
+endif()
+
 # --------------------------------------------------
 # SPIRV-Cross
 # --------------------------------------------------
@@ -158,7 +218,12 @@ set(SPIRV_CROSS_ENABLE_REFLECT OFF)
 set(SPIRV_CROSS_ENABLE_C_API OFF)
 set(SPIRV_CROSS_ENABLE_UTIL OFF)
 set(SPIRV_CROSS_SKIP_INSTALL ON)
-set(SPIRV_CROSS_ENABLE_WEBMIN ON)
+# BABYLON_NATIVE_DISABLE_WEBMIN : see comment in section above.
+if(BABYLON_NATIVE_DISABLE_WEBMIN)
+    set(SPIRV_CROSS_ENABLE_WEBMIN OFF)
+else()
+    set(SPIRV_CROSS_ENABLE_WEBMIN ON)
+endif()
 if(NOT GRAPHICS_API STREQUAL "OpenGL")
     set(SPIRV_CROSS_ENABLE_GLSL OFF)
 endif()
@@ -197,16 +262,6 @@ if(TARGET MachineIndependent)
     disable_warnings(MachineIndependent)
 endif()
 
-# --------------------------------------------------
-# xr
-# --------------------------------------------------
-# Currently supported on Android via ARCore, and iOS via ARKit.
-if((BABYLON_NATIVE_PLUGIN_NATIVEXR AND (ANDROID OR IOS)) OR BABYLON_NATIVE_BUILD_SOURCETREE)
-    add_subdirectory(xr)
-    set_property(TARGET xr PROPERTY FOLDER Dependencies/xr)
-    warnings_as_errors(xr)
-endif()
-
 # --------------------------------------------------
 # WebP
 # --------------------------------------------------
@@ -242,3 +297,13 @@ endif()
 if(WINDOWS_STORE)
     add_subdirectory(WindowsAppSDK)
 endif()
+
+# --------------------------------------------------
+# xr
+# --------------------------------------------------
+# Currently supported on Android via ARCore, and iOS via ARKit.
+if((BABYLON_NATIVE_PLUGIN_NATIVEXR AND (ANDROID OR IOS)) OR BABYLON_NATIVE_BUILD_SOURCETREE)
+    add_subdirectory(xr)
+    set_property(TARGET xr PROPERTY FOLDER Dependencies/xr)
+    warnings_as_errors(xr)
+endif()

package/shared/BabylonNative/Repo/Dependencies/xr/CMakeLists.txt

@@ -45,9 +45,7 @@ add_library(xrInternal INTERFACE)
 target_compile_definitions(xr PRIVATE _CRT_SECURE_NO_WARNINGS)
 
 if (APPLE)
-    set_target_properties(xr PROPERTIES
-        XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
-    )
+    enable_objc_arc(xr)
     set_property(TARGET xr PROPERTY UNITY_BUILD false)
 endif()
 

package/shared/BabylonNative/Repo/Plugins/ExternalTexture/CMakeLists.txt

@@ -1,17 +1,12 @@
 set(SOURCES
     "Include/Babylon/Plugins/ExternalTexture.h"
-    "Source/ExternalTexture_${GRAPHICS_API}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}"
+    "Source/ExternalTexture_${GRAPHICS_API}.cpp"
     "Source/ExternalTexture_Base.h"
     "Source/ExternalTexture_Shared.h")
 
 add_library(ExternalTexture ${SOURCES})
 warnings_as_errors(ExternalTexture)
 
-if (APPLE)
-    set_target_properties(ExternalTexture PROPERTIES
-        XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
-endif()
-
 target_include_directories(ExternalTexture
     PUBLIC "Include")
 

package/shared/BabylonNative/Repo/Plugins/ExternalTexture/Source/ExternalTexture_D3D11.cpp

@@ -61,6 +61,10 @@ namespace
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2A
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2A1
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACR11 UNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACR11 SNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACRG11 UNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACRG11 SNORM
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC12
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC14
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC12A

package/shared/BabylonNative/Repo/Plugins/ExternalTexture/Source/ExternalTexture_D3D12.cpp

@@ -61,6 +61,10 @@ namespace
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2A
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // ETC2A1
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACR11 UNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACR11 SNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACRG11 UNORM
+        { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // EACRG11 SNORM
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC12
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC14
         { DXGI_FORMAT_UNKNOWN,            DXGI_FORMAT_UNKNOWN              }, // PTC12A