[DO-NOT-MERGE] Diagnostic: JS-progress watchdog for UnitTests hangs

.github/workflows/build-linux.yml

@@ -24,7 +24,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 60
     env:
       CC: ${{ inputs.cc }}
       CXX: ${{ inputs.cxx }}

.github/workflows/ci.yml

@@ -2,101 +2,13 @@ name: CI
 
 on:
   push:
-    branches: [master]
+    branches: [master, unittest-watchdog]
   pull_request:
     branches: [master]
 
 jobs:
-  # ── Apple: macOS ──────────────────────────────────────────────
-  MacOS:
-    uses: ./.github/workflows/build-macos.yml
-
-  MacOS_Ninja:
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      generator: 'Ninja Multi-Config'
-
-  MacOS_Sanitizers:
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      enable-sanitizers: true
-
-  # ── Apple: iOS ────────────────────────────────────────────────
-  iOS_iOS180:
-    uses: ./.github/workflows/build-ios.yml
-    with:
-      deployment-target: '18.0'
-
-  iOS_iOS175:
-    uses: ./.github/workflows/build-ios.yml
-    with:
-      deployment-target: '17.5'
-
-  # ── Apple: Xcode 26 ──────────────────────────────────────────
-  MacOS_Xcode26:
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      xcode-version: '26.4'
-      runs-on: macos-26
-
-  iOS_Xcode26:
-    uses: ./.github/workflows/build-ios.yml
-    with:
-      deployment-target: '26.0'
-      xcode-version: '26.4'
-      runs-on: macos-26
-
-  # ── Win32─────────────────────────────────────────────────────
-  Win32_x64_D3D11:
-    uses: ./.github/workflows/build-win32.yml
-    with:
-      platform: x64
-
-  Win32_x64_JSI_D3D11:
-    uses: ./.github/workflows/build-win32.yml
-    with:
-      platform: x64
-      napi-type: jsi
-
-  Win32_x64_V8_D3D11:
-    uses: ./.github/workflows/build-win32.yml
-    with:
-      platform: x64
-      napi-type: V8
-
-  Win32_x64_D3D11_Sanitizers:
-    uses: ./.github/workflows/build-win32.yml
-    with:
-      platform: x64
-      enable-sanitizers: true
-
-  Win32_x64_D3D12:
-    uses: ./.github/workflows/build-win32.yml
-    with:
-      platform: x64
-      graphics-api: D3D12
-
-  Win32_x64_D3D11_PrecompiledShaderTest:
-    uses: ./.github/workflows/build-win32-shader.yml
-
-  # ── UWP ───────────────────────────────────────────────────────
-  UWP_x64:
-    uses: ./.github/workflows/build-uwp.yml
-    with:
-      platform: x64
-
-  UWP_arm64:
-    uses: ./.github/workflows/build-uwp.yml
-    with:
-      platform: arm64
-
-  UWP_arm64_JSI:
-    uses: ./.github/workflows/build-uwp.yml
-    with:
-      platform: arm64
-      napi-type: jsi
-
-  # ── Ubuntu / Linux ────────────────────────────────────────────
+  # TEMP: Linux-JSC-only while validating LIBGL_ALWAYS_SOFTWARE / GALLIUM_DRIVER fix.
+  # Restore from master before merging anywhere.
   Ubuntu_Clang_JSC:
     uses: ./.github/workflows/build-linux.yml
     with:
@@ -109,44 +21,4 @@ jobs:
     with:
       cc: gcc
       cxx: g++
-      js-engine: JavaScriptCore
-
-  # ── Android ───────────────────────────────────────────────────
-  Android_Ubuntu_JSC:
-    uses: ./.github/workflows/build-android.yml
-    with:
-      runs-on: ubuntu-latest
-      js-engine: JavaScriptCore
-
-  Android_Ubuntu_V8:
-    uses: ./.github/workflows/build-android.yml
-    with:
-      runs-on: ubuntu-latest
-      js-engine: V8
-
-  Android_MacOS_JSC:
-    uses: ./.github/workflows/build-android.yml
-    with:
-      runs-on: macos-latest
-      js-engine: JavaScriptCore
-
-  Android_MacOS_V8:
-    uses: ./.github/workflows/build-android.yml
-    with:
-      runs-on: macos-latest
-      js-engine: V8
-
-  # ── Installation Tests ────────────────────────────────────────
-  iOS_Installation:
-    uses: ./.github/workflows/test-install-ios.yml
-    with:
-      deployment-target: '17.2'
-
-  Linux_Installation:
-    uses: ./.github/workflows/test-install-linux.yml
-
-  MacOS_Installation:
-    uses: ./.github/workflows/test-install-macos.yml
-
-  Win32_Installation:
-    uses: ./.github/workflows/test-install-win32.yml
+      js-engine: JavaScriptCore

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/PrecompiledShaderTest/Source/App.cpp

@@ -135,40 +135,37 @@ int RunApp(
     Babylon::ScriptLoader loader{runtime};
     loader.LoadScript("app:///index.js");
 
-    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 = std::move(externalTexture), &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 = std::move(externalTexture), &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();
-
     // Start a new frame for rendering the scene.
     device.StartRenderingCurrentFrame();
     deviceUpdate.Start();

Apps/StyleTransferApp/Win32/App.cpp

@@ -334,37 +334,37 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
     loader.LoadScript("app:///Scripts/babylonjs.loaders.js");
     loader.LoadScript("app:///Scripts/index.js");
 
-    std::promise<void> addToContext{};
+    // Close the script-load frame.
+    g_update->Finish();
+    g_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.
+    g_device->StartRenderingCurrentFrame();
+    g_update->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{g_BabylonRenderTexture.get()}, &addToContext, &startup](Napi::Env env) {
-        auto jsPromise = externalTexture.AddToContextAsync(env);
-        addToContext.set_value();
-
-        jsPromise.Get("then").As<Napi::Function>().Call(jsPromise, {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();
-        })});
+    loader.Dispatch([externalTexture = Babylon::Plugins::ExternalTexture{g_BabylonRenderTexture.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.
     g_update->Finish();
     g_device->FinishRenderingCurrentFrame();
 
-    // Wait for `startup` to finish.
-    startup.get_future().wait();
-
     // --------------------------- Rendering loop -------------------------
 
     HACCEL hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_PLAYGROUNDWIN32));

Apps/UnitTests/CMakeLists.txt

@@ -11,13 +11,15 @@ set(BABYLONJS_MATERIALS_ASSETS
     "../node_modules/babylonjs-materials/babylonjs.materials.js")
 
 set(TEST_ASSETS
+    "JavaScript/dist/tests.externalTexture.render.js"
     "JavaScript/dist/tests.javaScript.all.js"
     "JavaScript/dist/tests.shaderCache.basicScene.js")
 
 set(SOURCES
     "Source/App.h"
     "Source/App.cpp"
     "Source/Tests.ExternalTexture.cpp"
+    "Source/Tests.ExternalTexture.Render.cpp"
     "Source/Tests.JavaScript.cpp"
     "Source/Tests.ShaderCache.cpp"
     "Source/Tests.UniformPadding.cpp"
@@ -26,8 +28,7 @@ set(SOURCES
 
 if(GRAPHICS_API STREQUAL "D3D11")
     set(SOURCES ${SOURCES}
-        "Source/Tests.Device.${GRAPHICS_API}.cpp"
-        "Source/Tests.ExternalTexture.${GRAPHICS_API}.cpp")
+        "Source/Tests.Device.${GRAPHICS_API}.cpp")
 endif()
 
 if(APPLE)
@@ -43,7 +44,11 @@ elseif(UNIX AND NOT ANDROID)
     set(SOURCES ${SOURCES} "Source/App.X11.cpp")
     set(ADDITIONAL_COMPILE_DEFINITIONS PRIVATE SKIP_EXTERNAL_TEXTURE_TESTS)
 elseif(WIN32)
-    set(SOURCES ${SOURCES} "Source/App.Win32.cpp")
+    set(SOURCES ${SOURCES}
+        "Source/App.Win32.cpp"
+        "Source/RenderDoc.h"
+        "Source/RenderDoc.cpp")
+    set(ADDITIONAL_COMPILE_DEFINITIONS ${ADDITIONAL_COMPILE_DEFINITIONS} PRIVATE HAS_RENDERDOC)
 endif()
 
 add_executable(UnitTests ${BABYLONJS_ASSETS} ${BABYLONJS_MATERIALS_ASSETS} ${TEST_ASSETS} ${SOURCES})
@@ -65,6 +70,10 @@ target_link_libraries(UnitTests
 
 target_compile_definitions(UnitTests PRIVATE ${ADDITIONAL_COMPILE_DEFINITIONS})
 
+if(GRAPHICS_API STREQUAL "D3D12")
+    target_compile_definitions(UnitTests PRIVATE SKIP_RENDER_TESTS)
+endif()
+
 add_test(NAME UnitTests COMMAND UnitTests)
 
 # See https://gitlab.kitware.com/cmake/cmake/-/issues/23543