Change queue creation parameters to require less raw pointer arrays

Author: devshgraphicsprogramming

examples_tests

@@ -5,8 +5,8 @@
 
 #include "nbl/system/IFile.h"
 
-namespace nbl::system {
-
+namespace nbl::system
+{
 
 
 class CMountDirectoryArchive : public IFileArchive

include/nbl/system/CMountDirectoryArchive.h

@@ -57,7 +57,7 @@ class IApplicationFramework : public core::IReferenceCounted
         static int main(int argc, char** argv)
         {
             path CWD = system::path(argv[0]).parent_path().generic_string() + "/";
-            auto app = core::make_smart_refctd_ptr<CRTP>(CWD/"../../media/",CWD/"../../tmp/",CWD/"../",CWD);
+            auto app = core::make_smart_refctd_ptr<CRTP>(CWD/"../",CWD,CWD/"../../media/",CWD/"../../tmp/");
             for (auto i=0; i<argc; i++)
                 app->argv.emplace_back(argv[i]);
 

include/nbl/system/IApplicationFramework.h

@@ -13,7 +13,7 @@ class IGPUSemaphore;
 class IGPUQueue : public core::Interface, public core::Unmovable
 {
     public:
-        enum E_CREATE_FLAGS : uint32_t
+        enum E_CREATE_FLAGS : uint16_t
         {
             ECF_NONE = 0x0,
             ECF_PROTECTED_BIT = 0x01

include/nbl/video/IGPUQueue.h

@@ -42,16 +42,22 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
     public:
         struct SQueueCreationParams
         {
-            IGPUQueue::E_CREATE_FLAGS flags;
-            uint32_t familyIndex;
-            uint32_t count;
-            const float* priorities;
+            constexpr static inline uint8_t MaxQueuesInFamily = 63;
+
+            IGPUQueue::E_CREATE_FLAGS flags = IGPUQueue::ECF_NONE;
+            uint8_t familyIndex = ~0u;
+            uint8_t count = 0;
+            std::array<float,MaxQueuesInFamily> priorities = []()->auto{
+                std::array<float,MaxQueuesInFamily> retval;retval.fill(IGPUQueue::DEFAULT_QUEUE_PRIORITY);return retval;
+            }();
         };
         struct SCreationParams
         {
+            constexpr static inline uint8_t MaxQueueFamilies = 16;
+
             uint32_t queueParamsCount;
-            const SQueueCreationParams* queueParams;
-            SPhysicalDeviceFeatures featuresToEnable;
+            std::array<SQueueCreationParams, MaxQueueFamilies> queueParams = {};
+            SPhysicalDeviceFeatures featuresToEnable = {};
             core::smart_refctd_ptr<asset::CCompilerSet> compilerSet = nullptr;
         };
 
@@ -483,18 +489,19 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
             : m_api(api), m_physicalDevice(physicalDevice), m_enabledFeatures(params.featuresToEnable), m_compilerSet(params.compilerSet)
         {
             uint32_t qcnt = 0u;
-            uint32_t greatestFamNum = 0u;
-            for (uint32_t i = 0u; i < params.queueParamsCount; ++i)
+            uint8_t greatestFamNum = 0u;
+            for (uint32_t i=0u; i<params.queueParamsCount; ++i)
             {
                 greatestFamNum = (std::max)(greatestFamNum, params.queueParams[i].familyIndex);
                 qcnt += params.queueParams[i].count;
             }
 
             m_queues = core::make_refctd_dynamic_array<queues_array_t>(qcnt);
             m_offsets = core::make_refctd_dynamic_array<q_offsets_array_t>(greatestFamNum + 1u, 0u);
-
-            for (const auto& qci : core::SRange<const SQueueCreationParams>(params.queueParams, params.queueParams + params.queueParamsCount))
+            
+            for (uint32_t i=0u; i<params.queueParamsCount; ++i)
             {
+                const auto& qci = params.queueParams[i];
                 if (qci.familyIndex == greatestFamNum)
                     continue;
 

include/nbl/video/ILogicalDevice.h

@@ -574,11 +574,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
         };
         auto getQueueFamilyProperties() const 
         {
-            using citer_t = qfam_props_array_t::pointee::const_iterator;
-            return core::SRange<const SQueueFamilyProperties, citer_t, citer_t>(
-                m_qfamProperties->cbegin(),
-                m_qfamProperties->cend()
-            );
+            return core::SRange<const SQueueFamilyProperties>(m_qfamProperties->data(),m_qfamProperties->data()+m_qfamProperties->size());
         }
 
         struct SBufferFormatPromotionRequest {

include/nbl/video/IPhysicalDevice.h

@@ -2519,7 +2519,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
             qci.queueCount = qparams.count;
             qci.queueFamilyIndex = qparams.familyIndex;
             qci.flags = static_cast<VkDeviceQueueCreateFlags>(qparams.flags);
-            qci.pQueuePriorities = qparams.priorities;
+            qci.pQueuePriorities = qparams.priorities.data();
         }
         vk_createInfo.pQueueCreateInfos = queueCreateInfos.data();
 

src/nbl/video/CVulkanPhysicalDevice.h

@@ -9,11 +9,9 @@ IPhysicalDevice::IPhysicalDevice(core::smart_refctd_ptr<system::ISystem>&& s, IA
 
 bool IPhysicalDevice::validateLogicalDeviceCreation(const ILogicalDevice::SCreationParams& params) const
 {
-    using range_t = core::SRange<const ILogicalDevice::SQueueCreationParams>;
-    range_t qcis(params.queueParams, params.queueParams+params.queueParamsCount);
-
-    for (const auto& qci : qcis)
+    for (auto i=0u; i<params.queueParamsCount; i++)
     {
+        const auto& qci = params.queueParams[i];
         if (qci.familyIndex >= m_qfamProperties->size())
             return false;