[DO-NOT-MERGE] Partner integration test: #1652 + #1646

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