[Vk] move VulkanPhysicalDevices into VulkanInstance

OGRECave · Nov 21, 2024 · 53157eb · 53157eb
1 parent 9d5b55a
commit 53157eb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 59 deletions.
diff --git a/RenderSystems/Vulkan/include/OgreVulkanDevice.h b/RenderSystems/Vulkan/include/OgreVulkanDevice.h
@@ -88,10 +88,14 @@ namespace Ogre
         void initDebugFeatures( PFN_vkDebugReportCallbackEXT callback, void *userdata,
                                 bool hasRenderDocApi );
 
+        void initPhysicalDeviceList();
+
     public:
         VkInstance mVkInstance;
         bool mVkInstanceIsExternal;
 
+        FastArray<VulkanPhysicalDevice> mVulkanPhysicalDevices;
+
         PFN_vkCreateDebugReportCallbackEXT CreateDebugReportCallback;
         PFN_vkDestroyDebugReportCallbackEXT DestroyDebugReportCallback;
         VkDebugReportCallbackEXT mDebugReportCallback;

diff --git a/RenderSystems/Vulkan/include/OgreVulkanPrerequisites.h b/RenderSystems/Vulkan/include/OgreVulkanPrerequisites.h
@@ -99,6 +99,7 @@ namespace Ogre
     class VulkanDynamicBuffer;
     struct VulkanGlobalBindingTable;
     class VulkanGpuProgramManager;
+    struct VulkanPhysicalDevice;
     class VulkanProgram;
     class VulkanProgramFactory;
     class VulkanQueue;

diff --git a/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h b/RenderSystems/Vulkan/include/OgreVulkanRenderSystem.h
@@ -58,7 +58,6 @@ namespace Ogre
         VkPhysicalDevice physicalDevice;
         String title;
     };
-    typedef std::vector<VulkanPhysicalDevice> VulkanPhysicalDeviceList;
 
     /**
        Implementation of Vulkan as a rendering system.
@@ -84,9 +83,8 @@ namespace Ogre
         VulkanProgramFactory *mVulkanProgramFactory3;
 
         std::shared_ptr<VulkanInstance> mInstance;
-        VulkanPhysicalDeviceList mVulkanPhysicalDeviceList;
-        VulkanSupport *mVulkanSupport;
 
+        VulkanSupport *mVulkanSupport;
         std::map<IdString, VulkanSupport *> mAvailableVulkanSupports;
 
         // TODO: AutoParamsBuffer probably belongs to MetalDevice (because it's per device?)
@@ -148,6 +146,7 @@ namespace Ogre
         ~VulkanRenderSystem() override;
 
         void shutdown() override;
+        const FastArray<VulkanPhysicalDevice> &getVulkanPhysicalDevices() const;
 
         const String &getName() const override;
         const String &getFriendlyName() const override;
@@ -187,8 +186,6 @@ namespace Ogre
 
         void reinitialise() override;
 
-        const VulkanPhysicalDeviceList &getVulkanPhysicalDevices( bool refreshList = false );
-
         Window *_initialise( bool autoCreateWindow,
                              const String &windowTitle = "OGRE Render Window" ) override;
 

diff --git a/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp b/RenderSystems/Vulkan/src/OgreVulkanDevice.cpp
@@ -286,6 +286,7 @@ namespace Ogre
 #if OGRE_DEBUG_MODE >= OGRE_DEBUG_MEDIUM
         initDebugFeatures( debugCallback, renderSystem, renderSystem->getRenderDocApi() );
 #endif
+        initPhysicalDeviceList();
     }
     //-------------------------------------------------------------------------
     VulkanInstance::~VulkanInstance()
@@ -393,6 +394,47 @@ namespace Ogre
 #endif
     }
     //-------------------------------------------------------------------------
+    void VulkanInstance::initPhysicalDeviceList()
+    {
+        LogManager::getSingleton().logMessage( "Vulkan: Device detection starts" );
+
+        // enumerate physical devices - list never changes for the same VkInstance
+        FastArray<VkPhysicalDevice> devices;
+        uint32 numDevices = 0u;
+        VkResult result = vkEnumeratePhysicalDevices( mVkInstance, &numDevices, NULL );
+        checkVkResult( result, "vkEnumeratePhysicalDevices" );
+
+        devices.resize( numDevices );
+        result = vkEnumeratePhysicalDevices( mVkInstance, &numDevices, devices.begin() );
+        checkVkResult( result, "vkEnumeratePhysicalDevices" );
+
+        if( numDevices == 0u )
+        {
+            OGRE_EXCEPT( Exception::ERR_RENDERINGAPI_ERROR, "No Vulkan devices found.",
+                         "VulkanRenderSystem::getVkPhysicalDevices" );
+        }
+
+        // assign unique names, allowing reordering/inserting/removing
+        map<String, unsigned>::type sameNameCounter;
+        mVulkanPhysicalDevices.clear();
+        mVulkanPhysicalDevices.reserve( devices.size() );
+        for( auto device : devices )
+        {
+            VkPhysicalDeviceProperties deviceProps;
+            vkGetPhysicalDeviceProperties( device, &deviceProps );
+
+            String name( deviceProps.deviceName );
+            unsigned sameNameIndex = sameNameCounter[name]++;  // inserted entry is zero-initialized
+            if( sameNameIndex != 0 )
+                name += " (" + Ogre::StringConverter::toString( sameNameIndex + 1 ) + ")";
+
+            LogManager::getSingleton().logMessage( "Vulkan: \"" + name + "\"" );
+            mVulkanPhysicalDevices.push_back( { device, name } );
+        }
+
+        LogManager::getSingleton().logMessage( "Vulkan: Device detection ends" );
+    }
+    //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
     VulkanDevice::VulkanDevice( VkInstance instance, const String &deviceName,
@@ -654,7 +696,7 @@ namespace Ogre
     //-------------------------------------------------------------------------
     void VulkanDevice::createPhysicalDevice( const String &deviceName )
     {
-        const VulkanPhysicalDeviceList &devices = mRenderSystem->getVulkanPhysicalDevices();
+        auto &devices = mRenderSystem->getVulkanPhysicalDevices();
         size_t deviceIdx = 0;
         for( size_t i = 0; i < devices.size(); ++i )
         {

diff --git a/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp b/RenderSystems/Vulkan/src/OgreVulkanRenderSystem.cpp
@@ -994,59 +994,6 @@ namespace Ogre
         this->_initialise( true );
     }
     //-------------------------------------------------------------------------
-    const VulkanPhysicalDeviceList &VulkanRenderSystem::getVulkanPhysicalDevices( bool refreshList )
-    {
-        if( refreshList || mVulkanPhysicalDeviceList.empty() )
-        {
-            LogManager::getSingleton().logMessage( "Vulkan: Device detection starts" );
-
-            // enumerate
-            std::vector<VkPhysicalDevice> devices;
-            VkResult result = VK_SUCCESS;
-            do
-            {
-                uint32 numDevices = 0u;
-                result = vkEnumeratePhysicalDevices( mInstance->mVkInstance, &numDevices, NULL );
-                checkVkResult( result, "vkEnumeratePhysicalDevices" );
-
-                if( numDevices == 0u )
-                {
-                    OGRE_EXCEPT( Exception::ERR_RENDERINGAPI_ERROR, "No Vulkan devices found.",
-                                 "VulkanRenderSystem::getVkPhysicalDevices" );
-                }
-
-                devices.resize( numDevices );
-                result =
-                    vkEnumeratePhysicalDevices( mInstance->mVkInstance, &numDevices, devices.data() );
-                devices.resize( numDevices );
-                if( result != VK_INCOMPLETE )
-                    checkVkResult( result, "vkEnumeratePhysicalDevices" );
-
-            } while( result == VK_INCOMPLETE );
-
-            // assign unique names, allowing reordering/inserting/removing
-            map<String, unsigned>::type sameNameCounter;
-            mVulkanPhysicalDeviceList.clear();
-            mVulkanPhysicalDeviceList.reserve( devices.size() );
-            for( VkPhysicalDevice device : devices )
-            {
-                VkPhysicalDeviceProperties deviceProps;
-                vkGetPhysicalDeviceProperties( device, &deviceProps );
-
-                String name( deviceProps.deviceName );
-                unsigned sameNameIndex = sameNameCounter[name]++;  // inserted entry is zero-initialized
-                if( sameNameIndex != 0 )
-                    name += " (" + Ogre::StringConverter::toString( sameNameIndex + 1 ) + ")";
-
-                LogManager::getSingleton().logMessage( "Vulkan: \"" + name + "\"" );
-                mVulkanPhysicalDeviceList.push_back( { device, name } );
-            }
-
-            LogManager::getSingleton().logMessage( "Vulkan: Device detection ends" );
-        }
-        return mVulkanPhysicalDeviceList;
-    }
-    //-------------------------------------------------------------------------
     Window *VulkanRenderSystem::_initialise( bool autoCreateWindow, const String &windowTitle )
     {
         Window *autoWindow = 0;
@@ -1368,6 +1315,11 @@ namespace Ogre
         return win;
     }
     //-------------------------------------------------------------------------
+    const FastArray<VulkanPhysicalDevice> &VulkanRenderSystem::getVulkanPhysicalDevices() const
+    {
+        return mInstance->mVulkanPhysicalDevices;
+    }
+    //-------------------------------------------------------------------------
     void VulkanRenderSystem::_notifyDeviceStalled()
     {
         v1::VulkanHardwareBufferManager *hwBufferMgr =