Only run AddToContextAsyncAndUpdateWithLayerIndex test in D3D11

Author: bghgary

Apps/UnitTests/CMakeLists.txt

@@ -21,10 +21,14 @@ set(SOURCES
     "Source/Tests.NativeEngine.cpp"
     "Source/Tests.ExternalTexture.cpp"
     "Source/Utils.h"
-    "Source/Utils_${GRAPHICS_API}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}")
+    "Source/Utils.${GRAPHICS_API}.${BABYLON_NATIVE_PLATFORM_IMPL_EXT}")
+
+if(GRAPHICS_API STREQUAL "D3D11")
+    set(SOURCES ${SOURCES} "Source/Tests.ExternalTexture.D3D11.cpp")
+endif()
 
 if(APPLE)
-    set(SOURCES ${SOURCES} "Source/App_Apple.mm")
+    set(SOURCES ${SOURCES} "Source/App.Apple.mm")
     if(BABYLON_NATIVE_TESTS_USE_NOOP_METAL_DEVICE)
         set(ADDITIONAL_COMPILE_DEFINITIONS
             PRIVATE USE_NOOP_METAL_DEVICE
@@ -33,10 +37,10 @@ if(APPLE)
     find_library(JAVASCRIPTCORE_LIBRARY JavaScriptCore)
     set(ADDITIONAL_LIBRARIES PRIVATE ${JAVASCRIPTCORE_LIBRARY})
 elseif(UNIX AND NOT ANDROID)
-    set(SOURCES ${SOURCES} "Source/App_X11.cpp")
+    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")
 endif()
 
 add_executable(UnitTests ${BABYLONJS_ASSETS} ${BABYLONJS_MATERIALS_ASSETS} ${TEST_ASSETS} ${SOURCES})

Apps/UnitTests/Source/App_Apple.mm Apps/UnitTests/Source/App.Apple.mmApps/UnitTests/Source/App_Apple.mm renamed to Apps/UnitTests/Source/App.Apple.mm

@@ -0,0 +1,81 @@
+#include <gtest/gtest.h>
+
+#include <Babylon/AppRuntime.h>
+#include <Babylon/Graphics/Device.h>
+#include <Babylon/Polyfills/Console.h>
+#include <Babylon/Polyfills/Window.h>
+#include <Babylon/Plugins/NativeEngine.h>
+#include <Babylon/Plugins/ExternalTexture.h>
+
+#include "Utils.h"
+
+extern Babylon::Graphics::Configuration g_deviceConfig;
+
+TEST(ExternalTexture, AddToContextAsyncAndUpdateWithLayerIndex)
+{
+#ifdef SKIP_EXTERNAL_TEXTURE_TESTS
+    GTEST_SKIP();
+#else
+    Babylon::Graphics::Device device{g_deviceConfig};
+    Babylon::Graphics::DeviceUpdate update{device.GetUpdate("update")};
+
+    device.StartRenderingCurrentFrame();
+    update.Start();
+
+    auto nativeTexture = CreateTestTexture(device.GetPlatformInfo().Device, 256, 256, 3);
+
+    Babylon::Plugins::ExternalTexture externalTexture{nativeTexture};
+
+    std::promise<void> addToContext{};
+    std::promise<void> promiseResolved{};
+
+    Babylon::AppRuntime runtime{};
+    runtime.Dispatch([&device, &addToContext, &promiseResolved, externalTexture](Napi::Env env) {
+        device.AddToJavaScript(env);
+
+        Babylon::Polyfills::Console::Initialize(env, [](const char* message, auto) {
+            std::cout << message << std::endl;
+        });
+
+        Babylon::Polyfills::Window::Initialize(env);
+
+        Babylon::Plugins::NativeEngine::Initialize(env);
+
+        // Test with explicit layer index 1
+        auto jsPromise = externalTexture.AddToContextAsync(env, 1);
+        addToContext.set_value();
+
+        auto jsOnFulfilled = Napi::Function::New(env, [&promiseResolved](const Napi::CallbackInfo& info) {
+            promiseResolved.set_value();
+        });
+
+        auto jsOnRejected = Napi::Function::New(env, [&promiseResolved](const Napi::CallbackInfo& info) {
+            promiseResolved.set_exception(std::make_exception_ptr(info[0].As<Napi::Error>()));
+        });
+
+        jsPromise.Get("then").As<Napi::Function>().Call(jsPromise, {jsOnFulfilled, jsOnRejected});
+    });
+
+    // Wait for AddToContextAsync to be called.
+    addToContext.get_future().wait();
+
+    // Render a frame so that AddToContextAsync will complete.
+    update.Finish();
+    device.FinishRenderingCurrentFrame();
+
+    // Wait for promise to resolve.
+    promiseResolved.get_future().wait();
+
+    // Start a new frame.
+    device.StartRenderingCurrentFrame();
+    update.Start();
+
+    // Update the external texture to a new texture with explicit layer index 2.
+    externalTexture.Update(nativeTexture, std::nullopt, 2);
+
+    DestroyTestTexture(nativeTexture);
+
+    update.Finish();
+    device.FinishRenderingCurrentFrame();
+#endif
+}

Apps/UnitTests/Source/App_Win32.cpp Apps/UnitTests/Source/App.Win32.cppApps/UnitTests/Source/App_Win32.cpp renamed to Apps/UnitTests/Source/App.Win32.cpp

@@ -6,15 +6,9 @@
 #include <Babylon/Polyfills/Window.h>
 #include <Babylon/Plugins/NativeEngine.h>
 #include <Babylon/Plugins/ExternalTexture.h>
-#include <Babylon/ScriptLoader.h>
-#include <Babylon/ShaderCache.h>
 
 #include "Utils.h"
 
-#include <chrono>
-#include <future>
-#include <iostream>
-
 extern Babylon::Graphics::Configuration g_deviceConfig;
 
 TEST(ExternalTexture, Construction)
@@ -107,72 +101,3 @@ TEST(ExternalTexture, AddToContextAsyncAndUpdate)
     device.FinishRenderingCurrentFrame();
 #endif
 }
-
-TEST(ExternalTexture, AddToContextAsyncAndUpdateWithLayerIndex)
-{
-#ifdef SKIP_EXTERNAL_TEXTURE_TESTS
-    GTEST_SKIP();
-#else
-    Babylon::Graphics::Device device{g_deviceConfig};
-    Babylon::Graphics::DeviceUpdate update{device.GetUpdate("update")};
-
-    device.StartRenderingCurrentFrame();
-    update.Start();
-
-    auto nativeTexture = CreateTestTexture(device.GetPlatformInfo().Device, 256, 256, 3);
-
-    Babylon::Plugins::ExternalTexture externalTexture{nativeTexture};
-
-    std::promise<void> addToContext{};
-    std::promise<void> promiseResolved{};
-
-    Babylon::AppRuntime runtime{};
-    runtime.Dispatch([&device, &addToContext, &promiseResolved, externalTexture](Napi::Env env) {
-        device.AddToJavaScript(env);
-
-        Babylon::Polyfills::Console::Initialize(env, [](const char* message, auto) {
-            std::cout << message << std::endl;
-        });
-
-        Babylon::Polyfills::Window::Initialize(env);
-
-        Babylon::Plugins::NativeEngine::Initialize(env);
-
-        // Test with explicit layer index 1
-        auto jsPromise = externalTexture.AddToContextAsync(env, 1);
-        addToContext.set_value();
-
-        auto jsOnFulfilled = Napi::Function::New(env, [&promiseResolved](const Napi::CallbackInfo& info) {
-            promiseResolved.set_value();
-        });
-
-        auto jsOnRejected = Napi::Function::New(env, [&promiseResolved](const Napi::CallbackInfo& info) {
-            promiseResolved.set_exception(std::make_exception_ptr(info[0].As<Napi::Error>()));
-        });
-
-        jsPromise.Get("then").As<Napi::Function>().Call(jsPromise, {jsOnFulfilled, jsOnRejected});
-    });
-
-    // Wait for AddToContextAsync to be called.
-    addToContext.get_future().wait();
-
-    // Render a frame so that AddToContextAsync will complete.
-    update.Finish();
-    device.FinishRenderingCurrentFrame();
-
-    // Wait for promise to resolve.
-    promiseResolved.get_future().wait();
-
-    // Start a new frame.
-    device.StartRenderingCurrentFrame();
-    update.Start();
-
-    // Update the external texture to a new texture with explicit layer index 2.
-    externalTexture.Update(nativeTexture, std::nullopt, 2);
-
-    DestroyTestTexture(nativeTexture);
-
-    update.Finish();
-    device.FinishRenderingCurrentFrame();
-#endif
-}