Improve DriverRuntime setup flow

Author: halx99

axmol/base/Director.cpp

@@ -1164,7 +1164,7 @@ void Director::cleanupDirector()
 
     ProgramManager::destroyInstance();
     VertexLayoutManager::destroyInstance();
-    rhi::DriverRuntime::uninit();
+    rhi::DriverRuntime::destroyCurrentDriver();
 
     // OpenGL view
     if (_renderView)

axmol/platform/android/RenderViewImpl-android.cpp

@@ -109,13 +109,10 @@ bool RenderViewImpl::initWithRect(std::string_view /*viewName*/,
 {
     updateRenderSurface(rect.size.width, rect.size.height, SurfaceUpdateFlag::AllUpdatesSilently);
 
-    if (rhi::DriverRuntime::isUnknown())
-        rhi::DriverRuntime::init(rhi::DriverType::OpenGL);
-
-    if (rhi::DriverRuntime::isVulkan())
-    {
+    if (rhi::DriverRuntime::isOpenGL())
+        rhi::DriverRuntime::activateCurrentDriver();
+    else if (rhi::DriverRuntime::isVulkan())
         recreateVkSurface(false);
-    }
 
     return true;
 }

axmol/platform/android/jni/AxmolEngineJni.cpp

@@ -63,7 +63,7 @@ JNIEXPORT void JNICALL Java_dev_axmol_lib_AxmolEngine_nativeInit(JNIEnv* env,
     auto app = ax::Application::getInstance();
     app->initContextAttrs();
 
-    rhi::DriverRuntime::init();
+    rhi::DriverRuntime::makeCurrentDriver();
 }
 
 JNIEXPORT void JNICALL Java_dev_axmol_lib_AxmolEngine_nativeSetEditTextDialogResult(JNIEnv* env,

axmol/platform/desktop/RenderViewImpl.cpp

@@ -107,6 +107,9 @@ The RenderViewImpl for win32,linux,macos,wasm
 
 namespace ax
 {
+
+using namespace rhi;
+
 #if defined(__EMSCRIPTEN__)
 struct IVec2
 {
@@ -457,15 +460,15 @@ void* RenderViewImpl::getNativeWindow() const
 
 SurfaceHandle RenderViewImpl::getNativeDisplay() const
 {
-    auto driverType = rhi::DriverRuntime::currentDriverType();
-    if (driverType == rhi::DriverType::Vulkan)
+    auto driverType = DriverRuntime::currentDriverType();
+    if (driverType == DriverType::Vulkan)
         return _vkSurface;
 
 #if AX_TARGET_PLATFORM == AX_PLATFORM_WIN32
     return glfwGetWin32Window(_mainWindow);
 #elif AX_TARGET_PLATFORM == AX_PLATFORM_MAC
-    return driverType == rhi::DriverType::Metal ? (void*)glfwGetCocoaView(_mainWindow)
-                                                : (void*)glfwGetNSGLContext(_mainWindow);
+    return driverType == DriverType::Metal ? (void*)glfwGetCocoaView(_mainWindow)
+                                           : (void*)glfwGetNSGLContext(_mainWindow);
     return (void*)glfwGetNSGLContext(_mainWindow);
 #elif AX_TARGET_PLATFORM == AX_PLATFORM_LINUX
     int platform = glfwGetPlatform();
@@ -559,20 +562,14 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
 
     Vec2 requestWinSize = rect.size * windowZoomFactor;
 
-#if AX_ENABLE_D3D11 || AX_ENABLE_D3D12 || AX_ENABLE_VK || AX_ENABLE_MTL
     // Try to initialize a high-performance graphics driver first.
     // If any of the high-performance APIs (D3D11/D3D12/Vulkan/Metal) are enabled,
     // the runtime will attempt initialization in the default priority order.
     // If all attempts fail, OpenGL will then be explicitly selected as the fallback.
-    ax::rhi::DriverRuntime::init();
-#endif
-
-    const auto driverType = rhi::DriverRuntime::currentDriverType();
-    const auto requiresGL = driverType == rhi::DriverType::OpenGL || driverType == rhi::DriverType::Unknown;
-    if (requiresGL)
+    DriverRuntime::makeCurrentDriver();
+    const auto fallbackGL = DriverRuntime::isOpenGL();
+    if (fallbackGL)
     {
-        if constexpr (!AX_ENABLE_GL)
-            throw std::runtime_error("OpenGL driver requires AX_ENABLE_GL to be enabled");
 #if AX_GLES_PROFILE
         glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
         glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_EGL_CONTEXT_API);
@@ -637,13 +634,11 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
     glfwSetWindowSizeLimits(_mainWindow, 1, 1, GLFW_DONT_CARE, GLFW_DONT_CARE);
 
 #if AX_ENABLE_GL
-    if (requiresGL)
+    if (fallbackGL)
     {
         glfwMakeContextCurrent(_mainWindow);
-        glfwSetWindowUserPointer(_mainWindow, rhi::gl::__state);
-
-        if (driverType == rhi::DriverType::Unknown)
-            ax::rhi::DriverRuntime::init(rhi::DriverType::OpenGL);
+        glfwSetWindowUserPointer(_mainWindow, gl::__state);
+        DriverRuntime::activateCurrentDriver();
     }
 #endif
 
@@ -666,13 +661,13 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
     updateRenderSurface(fbWidth, fbHeight, SurfaceUpdateFlag::RenderSizeChanged | SurfaceUpdateFlag::SilentUpdate);
 
 #if AX_ENABLE_VK
-    if (driverType == rhi::DriverType::Vulkan)
+    if (DriverRuntime::isVulkan())
     {
         auto _createSurface = [](VkInstance inst, void* window, VkSurfaceKHR* surface) {
             return glfwCreateWindowSurface(inst, static_cast<GLFWwindow*>(window), nullptr, surface);
         };
-        auto driver = static_cast<ax::rhi::vk::DriverImpl*>(axdrv);
-        const rhi::vk::SurfaceCreateInfo createInfo{
+        auto driver = static_cast<vk::DriverImpl*>(axdrv);
+        const vk::SurfaceCreateInfo createInfo{
             .window = _mainWindow, .width = fbWidth, .height = fbHeight, .createFunc = _createSurface};
         bool ok = driver->recreateSurface(createInfo);
         if (!ok)
@@ -729,7 +724,7 @@ bool RenderViewImpl::initWithRect(std::string_view viewName,
     glfwSetWindowCloseCallback(_mainWindow, GLFWEventHandler::onGLFWWindowCloseCallback);
 
 #if AX_ENABLE_GL
-    if (driverType == rhi::DriverType::OpenGL)
+    if (fallbackGL)
     {
 #    if !defined(__EMSCRIPTEN__)
         glfwSwapInterval(contextAttrs.vsync ? 1 : 0);
@@ -817,7 +812,7 @@ void RenderViewImpl::end()
 void RenderViewImpl::swapBuffers()
 {
 #if AX_ENABLE_GL
-    if (_mainWindow && rhi::DriverRuntime::isOpenGL())
+    if (_mainWindow && DriverRuntime::isOpenGL())
         glfwSwapBuffers(_mainWindow);
 #endif
 }

axmol/platform/ios/RenderHostView-ios.mm

@@ -73,6 +73,8 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 
 #include "axmol/rhi/DriverRuntime.h"
 
+using namespace ax::rhi;
+
 // CLASS IMPLEMENTATIONS:
 
 #define IOS_MAX_TOUCHES_COUNT 10
@@ -109,7 +111,7 @@ + (Class)layerClass
 #elif !AX_ENABLE_MTL && AX_ENABLE_GL
     return [CAEAGLLayer class];
 #else
-    return ax::rhi::DriverRuntime::isMetal() ? [CAMetalLayer class] : [CAEAGLLayer class];
+    return DriverRuntime::isMetal() ? [CAMetalLayer class] : [CAEAGLLayer class];
 #endif
 }
 
@@ -182,7 +184,7 @@ - (id)initWithFrame:(CGRect)frame
          multiSampling:(BOOL)sampling
        numberOfSamples:(unsigned int)nSamples
 {
-    auto driverType = ax::rhi::DriverRuntime::init();
+    DriverRuntime::makeCurrentDriver();
 
     if ((self = [super initWithFrame:frame]))
     {
@@ -195,7 +197,7 @@ - (id)initWithFrame:(CGRect)frame
             self.contentScaleFactor = [[UIScreen mainScreen] scale];
         }
 
-        if (ax::rhi::DriverRuntime::isMetal())
+        if (DriverRuntime::isMetal())
         {
             AX_UNUSED_PARAM(format);
             AX_UNUSED_PARAM(depth);
@@ -213,9 +215,7 @@ - (id)initWithFrame:(CGRect)frame
                 [self release];
                 return nil;
             }
-
-            if (driverType == ax::rhi::DriverType::Unknown)
-                ax::rhi::DriverRuntime::init(ax::rhi::DriverType::OpenGL);
+            DriverRuntime::activateCurrentDriver();
         }
     }
 
@@ -227,7 +227,7 @@ - (id)initWithCoder:(NSCoder*)aDecoder
     if ((self = [super initWithCoder:aDecoder]))
     {
         self.textInputView = [[TextInputView alloc] initWithCoder:aDecoder];
-        if (ax::rhi::DriverRuntime::isMetal())
+        if (DriverRuntime::isMetal())
         {
             backingSize_ = [self bounds].size;
         }
@@ -297,7 +297,7 @@ - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];  // remove keyboard notification
 #if AX_ENABLE_GL
-    if (ax::rhi::DriverRuntime::isOpenGL())
+    if (DriverRuntime::isOpenGL())
         [renderer_ release];
 #endif
     [self.textInputView release];
@@ -312,7 +312,7 @@ - (void)layoutSubviews
 
     savedBounds_              = [self bounds];
     self.textInputView.bounds = savedBounds_;
-    if (ax::rhi::DriverRuntime::isMetal())
+    if (DriverRuntime::isMetal())
     {
         backingSize_ = savedBounds_.size;
         backingSize_.width *= self.contentScaleFactor;
@@ -342,7 +342,7 @@ - (void)swapBuffers
     //    -> context_ MUST be the OpenGL context
     //    -> renderbuffer_ must be the RENDER BUFFER
 
-    if (ax::rhi::DriverRuntime::isMetal())
+    if (DriverRuntime::isMetal())
         return;
 
 #    ifdef __IPHONE_4_0

axmol/platform/winrt/xaml/SwapChainPage.cpp

@@ -72,19 +72,16 @@ SwapChainPage::SwapChainPage()
     appDelegate.reset(new AppDelegate());
     ax::Application::getInstance()->initContextAttrs();
 
-#if AX_ENABLE_D3D11 || AX_ENABLE_D3D12
     // Try to initialize a high-performance graphics driver first.
     // If any of the high-performance APIs (D3D11/D3D12/Vulkan/Metal) are enabled,
     // the runtime will attempt initialization in the default priority order.
     // If all attempts fail, OpenGL will then be explicitly selected as the fallback.
-    auto driverType = rhi::DriverRuntime::init();
-    m_requiresGL    = driverType == rhi::DriverType::Unknown || driverType == rhi::DriverType::OpenGL;
-#else
-    m_requiresGL = true;
+    rhi::DriverRuntime::makeCurrentDriver();
+    m_fallbackGL = rhi::DriverRuntime::isOpenGL();
 #endif
 
 #if AX_ENABLE_GL
-    if (m_requiresGL)
+    if (m_fallbackGL)
         m_eglSurfaceProvider = new EGLSurfaceProvider();
 #endif
     InitializeComponent();
@@ -181,7 +178,7 @@ void SwapChainPage::CreateRenderSurface()
 {
     UpdatePanelSize();
 #if AX_ENABLE_GL
-    if (!m_requiresGL)
+    if (!m_fallbackGL)
         return;
     if (m_eglSurfaceProvider && m_eglSurface == EGL_NO_SURFACE)
     {
@@ -215,7 +212,7 @@ void SwapChainPage::UpdatePanelSize()
 void SwapChainPage::DestroyRenderSurface()
 {
 #if AX_ENABLE_GL
-    if (!m_requiresGL)
+    if (!m_fallbackGL)
         return;
     if (m_eglSurfaceProvider)
     {
@@ -231,7 +228,7 @@ void SwapChainPage::DestroyRenderSurface()
 void SwapChainPage::RecoverFromLostDevice()
 {
 #if AX_ENABLE_GL
-    if (m_requiresGL)
+    if (m_fallbackGL)
     {
         critical_section::scoped_lock lock(m_eglSurfaceCriticalSection);
         DestroyRenderSurface();
@@ -248,7 +245,7 @@ void SwapChainPage::RecoverFromLostDevice()
 void SwapChainPage::TerminateApp()
 {
 #if AX_ENABLE_GL
-    if (m_requiresGL)
+    if (m_fallbackGL)
     {
         critical_section::scoped_lock lock(m_eglSurfaceCriticalSection);
 
@@ -291,11 +288,10 @@ void SwapChainPage::StartRenderLoop()
         }
 
 #if AX_ENABLE_GL
-        if (m_requiresGL)
+        if (m_fallbackGL)
         {
             m_eglSurfaceProvider->MakeCurrent(m_eglSurface);
-            if (rhi::DriverRuntime::isUnknown())
-                rhi::DriverRuntime::init(rhi::DriverType::OpenGL);
+            rhi::DriverRuntime::activateCurrentDriver();
         }
 #endif
 

axmol/platform/winrt/xaml/SwapChainPage.h

@@ -108,7 +108,7 @@ struct SwapChainPage : SwapChainPageT<SwapChainPage>
     bool m_deviceLost;
     bool m_visible;
     bool m_cursorVisible;
-    bool m_requiresGL{false};
+    bool m_fallbackGL{false};
 
     Windows::Graphics::Display::DisplayOrientations m_orientation;