Merge remote-tracking branch 'upstream/master' into hermes-integration

# Conflicts:
#	CMakeLists.txt

Author: CedricGuillemet

.github/workflows/build-uwp.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2022
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v5

.github/workflows/build-win32-shader.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2022
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v5

.github/workflows/build-win32.yml

@@ -21,7 +21,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2022
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v5

.github/workflows/test-install-win32.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   test-install:
-    runs-on: windows-latest
+    runs-on: windows-2022
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v5

Apps/HeadlessScreenshotApp/Win32/App.cpp

@@ -127,41 +127,37 @@ int main()
     // Create a render target texture for the output.
     winrt::com_ptr<ID3D11Texture2D> outputTexture = CreateD3DRenderTargetTexture(d3dDevice.get());
 
-    std::promise<void> addToContext{};
+    // Close the script-load frame.
+    deviceUpdate.Finish();
+    device.FinishRenderingCurrentFrame();
+
+    // Open a new frame for `startup` so the JS-side resource creation and
+    // startup() call run in the same frame as the wait that observes them.
+    device.StartRenderingCurrentFrame();
+    deviceUpdate.Start();
+
     std::promise<void> startup{};
 
     // Create an external texture for the render target texture and pass it to
     // the `startup` JavaScript function.
-    loader.Dispatch([externalTexture = Babylon::Plugins::ExternalTexture{outputTexture.get()}, &addToContext, &startup](Napi::Env env) {
-        auto jsPromise = externalTexture.AddToContextAsync(env);
-        addToContext.set_value();
-
-        auto jsOnFulfilled = Napi::Function::New(env, [&startup](const Napi::CallbackInfo& info) {
-            auto nativeTexture = info[0];
-            info.Env().Global().Get("startup").As<Napi::Function>().Call(
-                {
-                    nativeTexture,
-                    Napi::Value::From(info.Env(), WIDTH),
-                    Napi::Value::From(info.Env(), HEIGHT),
-                });
-            startup.set_value();
-        });
-
-        jsPromise = jsPromise.Get("then").As<Napi::Function>().Call(jsPromise, {jsOnFulfilled}).As<Napi::Promise>();
-
-        CatchAndLogError(jsPromise);
+    loader.Dispatch([externalTexture = Babylon::Plugins::ExternalTexture{outputTexture.get()}, &startup](Napi::Env env) {
+        auto nativeTexture = externalTexture.CreateForJavaScript(env);
+        env.Global().Get("startup").As<Napi::Function>().Call(
+            {
+                nativeTexture,
+                Napi::Value::From(env, WIDTH),
+                Napi::Value::From(env, HEIGHT),
+            });
+        startup.set_value();
     });
 
-    // Wait for `AddToContextAsync` to be called.
-    addToContext.get_future().wait();
+    // Wait for `startup` to finish.
+    startup.get_future().wait();
 
-    // Render a frame so that `AddToContextAsync` will complete.
+    // Close the startup frame.
     deviceUpdate.Finish();
     device.FinishRenderingCurrentFrame();
 
-    // Wait for `startup` to finish.
-    startup.get_future().wait();
-
     struct Asset
     {
         const char* Name;

Apps/ModuleLoadTest/Source/App.Win32.cpp

@@ -129,6 +129,10 @@ namespace ModuleLoadTest
             "dxil.dll",
             // VS Start-Without-Debugging launch environment
             "kernel.appcore.dll",
+            // Ambient shell/appcore DLL pulled in transitively (e.g. via
+            // windows.storage.dll / DComp) on some Windows images such as the
+            // GitHub windows-2022 runner; not introduced by BabylonNative.
+            "twinapi.appcore.dll",
         };
         for (const auto& prefix : kPrefixes)
         {

Apps/Playground/Scripts/config.json

@@ -1568,9 +1568,7 @@
             "title": "Particles",
             "playgroundId": "#G3ZYFU#7",
             "renderCount": 100,
-            "referenceImage": "particles.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles.png"
         },
         {
             "title": "PBRMetallicRoughnessMaterial",
@@ -1842,16 +1840,14 @@
         {
             "title": "Instances with color buffer",
             "playgroundId": "#YPABS1#91",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel comparison fails (more than 20% pixels differ)",
             "referenceImage": "instancecolors.png"
         },
         {
             "title": "Prepass SSAO + particles",
             "playgroundId": "#65MUMZ#47",
             "renderCount": 50,
             "excludeFromAutomaticTesting": true,
-            "reason": "Test crashes or hangs on Babylon Native",
+            "reason": "SSAO2 blur post-process shader fails to compile on desktop GL (samples uniform used as int loop bound); unrelated to instancing.",
             "referenceImage": "prepass-ssao-particles.png"
         },
         {
@@ -2694,8 +2690,6 @@
             "title": "halo-particle-system",
             "playgroundId": "#2441BU#1",
             "renderCount": 20,
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up.",
             "referenceImage": "halo-particle-system.png"
         },
         {
@@ -2710,8 +2704,6 @@
             "title": "particle-system-with-custom-nme-shader",
             "playgroundId": "#DMLLV2",
             "renderCount": 5,
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up.",
             "referenceImage": "particle-system-with-custom-nme-shader.png"
         },
         {
@@ -4106,9 +4098,7 @@
             "title": "Particles - Basic Properties - Color",
             "playgroundId": "#0K3AQ2#3786",
             "renderCount": 120,
-            "referenceImage": "particles-basic-color.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-color.png"
         },
         {
             "title": "Particles - Basic Properties - Speed",
@@ -4138,9 +4128,7 @@
             "title": "Particles - Basic Properties - Direction",
             "playgroundId": "#0K3AQ2#3814",
             "renderCount": 120,
-            "referenceImage": "particles-basic-direction.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-direction.png"
         },
         {
             "title": "Particles - Basic Properties - Direction - Gravity",
@@ -4158,9 +4146,7 @@
             "title": "Particles - Basic Properties - Emit Rate - Fast",
             "playgroundId": "#0K3AQ2#3823",
             "renderCount": 120,
-            "referenceImage": "particles-basic-emit-rate-fast.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-emit-rate-fast.png"
         },
         {
             "title": "Particles - Basic Properties - Emission Limits",
@@ -4184,9 +4170,7 @@
             "title": "Particles - Change - Size",
             "playgroundId": "#0K3AQ2#3841",
             "renderCount": 120,
-            "referenceImage": "particles-basic-change-size.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-change-size.png"
         },
         {
             "title": "Particles - Change - Size 2",
@@ -4198,17 +4182,13 @@
             "title": "Particles - Change - Color",
             "playgroundId": "#0K3AQ2#3847",
             "renderCount": 120,
-            "referenceImage": "particles-basic-change-color.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-change-color.png"
         },
         {
             "title": "Particles - Change - Color 2",
             "playgroundId": "#0K3AQ2#3851",
             "renderCount": 120,
-            "referenceImage": "particles-basic-change-color-2.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-change-color-2.png"
         },
         {
             "title": "Particles - Change - Speed",
@@ -4268,9 +4248,7 @@
             "title": "Particles - Change - Lifetime",
             "playgroundId": "#0K3AQ2#3885",
             "renderCount": 120,
-            "referenceImage": "particles-basic-change-lifetime.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-basic-change-lifetime.png"
         },
         {
             "title": "Particles - Change - Lifetime 2",
@@ -4288,25 +4266,19 @@
             "title": "Particles - Emitters - Point",
             "playgroundId": "#WLX2I2#7",
             "renderCount": 120,
-            "referenceImage": "particles-emitters-point.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-emitters-point.png"
         },
         {
             "title": "Particles - Emitters - Box",
             "playgroundId": "#WLX2I2#8",
             "renderCount": 120,
-            "referenceImage": "particles-emitters-box.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-emitters-box.png"
         },
         {
             "title": "Particles - Emitters - Sphere",
             "playgroundId": "#WLX2I2#9",
             "renderCount": 120,
-            "referenceImage": "particles-emitters-sphere.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-emitters-sphere.png"
         },
         {
             "title": "Particles - Emitters - Directed Sphere",
@@ -4324,9 +4296,7 @@
             "title": "Particles - Emitters - Cylinder",
             "playgroundId": "#WLX2I2#12",
             "renderCount": 120,
-            "referenceImage": "particles-emitters-cylinder.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-emitters-cylinder.png"
         },
         {
             "title": "Particles - Emitters - Directed Cylinder",
@@ -4346,9 +4316,7 @@
             "title": "Particles - Emitters - Directed Cone",
             "playgroundId": "#WLX2I2#17",
             "renderCount": 120,
-            "referenceImage": "particles-emitters-directed-cone.png",
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up."
+            "referenceImage": "particles-emitters-directed-cone.png"
         },
         {
             "title": "Particles - Emitters - Mesh",
@@ -4458,8 +4426,6 @@
             "title": "Particles - Attractors",
             "playgroundId": "#DEZ79M#73",
             "renderCount": 240,
-            "excludeFromAutomaticTesting": true,
-            "reason": "Pixel diff after #1691 instance-data stride fix; not stride-related, needs follow-up.",
             "referenceImage": "particles-attractors.png"
         },
         {

Apps/Playground/Shared/Diagnostics.cpp

@@ -1,5 +1,6 @@
 #include "Diagnostics.h"
 
+#include <bx/bx.h>
 #include <bx/debug.h>
 #include <bx/error.h>
 #include <bx/platform.h>
@@ -110,6 +111,57 @@ namespace
         std::_Exit(3);
     }
 #endif
+
+    // bx routes BOTH BX_ASSERT failures and the Windows SEH top-level
+    // exception filter (bx::installExceptionHandler) through its assert
+    // handler. bx's built-in default writes the banner only to
+    // bx::getDebugOut() (OutputDebugString), which is invisible in a console /
+    // CI run, and then tears the process down via TerminateProcess -- so the
+    // native callstack never reaches the log and atexit (the finish line)
+    // never runs. Route it through DumpFailure instead, which writes to stderr
+    // (captured by CI), then exit deterministically with code 3 like the other
+    // hard-failure handlers above.
+    bool OnBxAssert(const bx::Location& location, uint32_t skip, const char* format, va_list args)
+    {
+        // Guard against re-entry if formatting/stack-walking itself faults.
+        // Returning false here would tell bx to *continue* past the failed
+        // assert / propagate the exception, i.e. keep running in an
+        // already-failing state. Instead fail fast deterministically: skip the
+        // (faulting) formatting path, emit a minimal marker, and exit.
+        static std::atomic<bool> s_inHandler{false};
+        bool expected = false;
+        if (!s_inHandler.compare_exchange_strong(expected, true))
+        {
+            std::fputs("\n--- BN: CRASH (re-entrant) ---\n", stderr);
+            std::fflush(stderr);
+            Diagnostics::SetExitCode(3);
+            Diagnostics::PrintFinishLine();
+            std::_Exit(3);
+        }
+
+        // bx's exception-handler call sites (SEH filter, pure-call) pass
+        // UINT32_MAX as the line and a synthetic file ("Exception Handler");
+        // real BX_ASSERT sites pass an actual file/line.
+        const bool isException = (location.line == UINT32_MAX);
+        Diagnostics::DumpFailureV(
+            isException ? "CRASH" : "ASSERT",
+            isException ? nullptr : location.filePath,
+            isException ? 0 : static_cast<int>(location.line),
+            skip,
+            format,
+            args);
+
+#if defined(_MSC_VER)
+        if (::IsDebuggerPresent())
+        {
+            bx::debugBreak();
+        }
+#endif
+
+        Diagnostics::SetExitCode(3);
+        Diagnostics::PrintFinishLine();
+        std::_Exit(3);
+    }
 }
 
 namespace Diagnostics
@@ -124,6 +176,10 @@ namespace Diagnostics
 
         bx::installExceptionHandler();
 
+        // Route bx asserts + the SEH top-level exception filter to DumpFailure
+        // (stderr-visible) instead of bx's OutputDebugString-only default.
+        bx::setAssertHandler(&OnBxAssert);
+
 #if defined(_MSC_VER)
         // Route assert() to stderr instead of UCRT's modal dialog. Covers the
         // direct assert() codepath; _CrtSetReportMode below covers _CRT_*.