Cleaned up the IDeviceMemoryBacked SCreationParams and placed a limit on total Queue Familiy counts

Also added some getters to `IDeviceMemoryAllocator`

Author: devsh

include/nbl/video/IDeviceMemoryAllocator.h

@@ -9,9 +9,12 @@
 namespace nbl::video
 {
 
-class IDeviceMemoryAllocator
+class NBL_API2 IDeviceMemoryAllocator
 {
 	public:
+		// right now we only support this interface handing out memory for one device or group
+		virtual ILogicalDevice* getDeviceForAllocations() const = 0;
+
 		struct SAllocateInfo
 		{
 			size_t size : 54 = 0ull;
@@ -21,6 +24,21 @@ class IDeviceMemoryAllocator
 			// size_t opaqueCaptureAddress = 0u; Note that this mechanism is intended only to support capture/replay tools, and is not recommended for use in other applications.
 		};
 
+		struct SAllocation
+		{
+			static constexpr size_t InvalidMemoryOffset = 0xdeadbeefBadC0ffeull;
+			bool isValid() const
+			{
+				return memory && (offset!=InvalidMemoryOffset);
+			}
+
+			core::smart_refctd_ptr<IDeviceMemoryAllocation> memory = nullptr;
+			size_t offset = InvalidMemoryOffset;
+		};
+
+		virtual SAllocation allocate(const SAllocateInfo& info) = 0;
+
+
 		//! IMemoryTypeIterator extracts memoryType indices from memoryTypeBits in arbitrary order
 		//! which is used to give priority to memoryTypes in try-allocate usages where allocations may fail with some memoryTypes
 		//! IMemoryTypeIterator will construct SAllocateInfo from object's memory requirements, allocateFlags and dedication using operator()
@@ -85,20 +103,6 @@ class IDeviceMemoryAllocator
 
 				uint32_t currentIndex = 0u;
 		};
-		
-
-		struct SAllocation
-		{
-			static constexpr size_t InvalidMemoryOffset = 0xdeadbeefBadC0ffeull;
-			bool isValid() const
-			{
-				return memory && (offset!=InvalidMemoryOffset);
-			}
-
-			core::smart_refctd_ptr<IDeviceMemoryAllocation> memory = nullptr;
-			size_t offset = InvalidMemoryOffset;
-		};
-		virtual SAllocation allocate(const SAllocateInfo& info) = 0;
 
 		template<class memory_type_iterator_t=DefaultMemoryTypeIterator>
 		inline SAllocation allocate(

include/nbl/video/IDeviceMemoryBacked.h

@@ -26,14 +26,16 @@ class IDeviceMemoryBacked : public IBackendObject
 {
     public:
         //!
-        struct SCachedCreationParams
+        constexpr static inline uint8_t MaxQueueFamilies = 7;
+        struct SCreationParams
         {
             // A Pre-Destroy-Step is called out just before a `vkDestory` or `glDelete`, this is only useful for "imported" resources
             std::unique_ptr<ICleanup> preDestroyCleanup = nullptr;
             // A Post-Destroy-Step is called in this class' destructor, this is only useful for "imported" resources
             std::unique_ptr<ICleanup> postDestroyCleanup = nullptr;
             // If more than one, then we're doing concurrent resource sharing
             uint8_t queueFamilyIndexCount = 0u;
+            const uint32_t* queueFamilyIndices = nullptr;
             // Thus the destructor will skip the call to `vkDestroy` or `glDelete` on the handle, this is only useful for "imported" objects
             bool skipHandleDestroy = false;
 
@@ -43,7 +45,8 @@ class IDeviceMemoryBacked : public IBackendObject
                 return queueFamilyIndexCount>1u;
             }
         };
-        inline const SCachedCreationParams& getCachedCreationParams() const {return m_cachedCreationParams;}
+        // TODO: change name later on, but right now too much code to refactor
+        inline const SCreationParams& getCachedCreationParams() const {return m_cachedCreationParams;}
 
         //! We need to know to cast to `IGPUBuffer` or `IGPUImage`
         enum E_OBJECT_TYPE : bool
@@ -87,15 +90,14 @@ class IDeviceMemoryBacked : public IBackendObject
         //! Returns the allocation which is bound to the resource
         virtual SMemoryBinding getBoundMemory() const = 0;
 
-        //! For constructor parameter only
-        struct SCreationParams : SCachedCreationParams
-        {
-            const uint32_t* queueFamilyIndices = nullptr;
-        };
-
     protected:
         inline IDeviceMemoryBacked(core::smart_refctd_ptr<const ILogicalDevice>&& originDevice, SCreationParams&& creationParams, const SDeviceMemoryRequirements& reqs)
-            : IBackendObject(std::move(originDevice)), m_cachedCreationParams(std::move(creationParams)), m_cachedMemoryReqs(reqs) {}
+            : IBackendObject(std::move(originDevice)), m_cachedCreationParams(std::move(creationParams)), m_cachedMemoryReqs(reqs)
+        {
+            std::fill_n(m_queueFamilies,MaxQueueFamilies,~0u);
+            std::copy_n(m_cachedCreationParams.queueFamilyIndices,m_cachedCreationParams.queueFamilyIndexCount,m_queueFamilies);
+            m_cachedCreationParams.queueFamilyIndices = m_queueFamilies;
+        }
         inline virtual ~IDeviceMemoryBacked()
         {
             assert(!m_cachedCreationParams.preDestroyCleanup); // derived class should have already cleared this out
@@ -109,8 +111,9 @@ class IDeviceMemoryBacked : public IBackendObject
 
 
         //! members
-        SCachedCreationParams m_cachedCreationParams;
+        SCreationParams m_cachedCreationParams;
         SDeviceMemoryRequirements m_cachedMemoryReqs;
+        uint32_t m_queueFamilies[MaxQueueFamilies];
 };
 
 template<typename T>

include/nbl/video/ILogicalDevice.h

@@ -26,7 +26,9 @@ class IPhysicalDevice;
 class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMemoryAllocator
 {
     public:
-        constexpr static inline uint8_t MaxQueueFamilies = 7;
+        inline ILogicalDevice* getDeviceForAllocations() const override {return const_cast<ILogicalDevice*>(this);}
+
+        constexpr static inline uint8_t MaxQueueFamilies = IDeviceMemoryBacked::MaxQueueFamilies;
         struct SQueueCreationParams
         {
             constexpr static inline uint8_t MaxQueuesInFamily = 15;
@@ -331,6 +333,11 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
                 m_logger.log("Failed to create Buffer, size %d larger than Device %p's limit (%u)!",system::ILogger::ELL_ERROR,creationParams.size,this,maxSize);
                 return nullptr;
             }
+            if (creationParams.queueFamilyIndexCount>MaxQueueFamilies)
+            {
+                m_logger.log("Failed to create Buffer, queue family count %d for concurrent sharing larger than our max %d!",system::ILogger::ELL_ERROR,creationParams.queueFamilyIndexCount,MaxQueueFamilies);
+                return nullptr;
+            }
             return createBuffer_impl(std::move(creationParams));
         }
         // Create a BufferView, to a shader; a fake 1D-like texture with no interpolation (@see ICPUBufferView)
@@ -343,7 +350,12 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
                 m_logger.log("Failed to create Image, invalid creation parameters!",system::ILogger::ELL_ERROR);
                 return nullptr;
             }
-            // TODO: @Cyprian validation of creationParams against the device's limits (sample counts, etc.) see vkCreateImage
+            if (creationParams.queueFamilyIndexCount>MaxQueueFamilies)
+            {
+                m_logger.log("Failed to create Image, queue family count %d for concurrent sharing larger than our max %d!",system::ILogger::ELL_ERROR,creationParams.queueFamilyIndexCount,MaxQueueFamilies);
+                return nullptr;
+            }
+            // TODO: validation of creationParams against the device's limits (sample counts, etc.) see vkCreateImage docs
             return createImage_impl(std::move(creationParams));
         }
         // Create an ImageView that can actually be used by shaders (@see ICPUImageView)