make image usages constexpr, add some super cool utilities to device filter and Queue

Author: devshgraphicsprogramming

include/nbl/video/IGPUQueue.h

@@ -64,6 +64,19 @@ class IGPUQueue : public core::Interface, public core::Unmovable
         uint32_t getFamilyIndex() const { return m_familyIndex; }
         E_CREATE_FLAGS getFlags() const { return m_flags; }
 
+        // When dealing with external/foreign queues treat `other` as nullptr
+        inline bool needsOwnershipTransfer(const IGPUQueue* other) const
+        {
+            if (!other)
+                return true;
+
+            if (m_familyIndex==other->m_familyIndex)
+                return false;
+            
+            // TODO: take into account concurrent sharing indices, but then we'll need to remember the concurrent sharing family indices
+            return true;
+        }
+
         inline constexpr static float DEFAULT_QUEUE_PRIORITY = 1.f;
 
         // OpenGL: const egl::CEGL::Context*

include/nbl/video/IPhysicalDevice.h

@@ -392,7 +392,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                 uint16_t transferDst : 1u;
                 uint16_t log2MaxSamples : 3u; // 0 means cant use as a multisample image format
 
-                SUsage()
+                constexpr SUsage()
                     : sampledImage(0)
                     , storageImage(0)
                     , storageImageAtomic(0)
@@ -405,7 +405,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     , log2MaxSamples(0)
                 {}
 
-                SUsage(core::bitflag<asset::IImage::E_USAGE_FLAGS> usages):
+                constexpr SUsage(core::bitflag<asset::IImage::E_USAGE_FLAGS> usages) :
                     log2MaxSamples(0),
                     sampledImage(usages.hasFlags(asset::IImage::EUF_SAMPLED_BIT)),
                     storageImage(usages.hasFlags(asset::IImage::EUF_STORAGE_BIT)),
@@ -419,7 +419,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     storageImageAtomic(0)
                 {}
 
-                inline SUsage operator & (const SUsage& other) const
+                constexpr SUsage operator&(const SUsage& other) const
                 {
                     SUsage result;
                     result.sampledImage = sampledImage & other.sampledImage;
@@ -435,7 +435,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     return result;
                 }
 
-                inline SUsage operator | (const SUsage& other) const
+                constexpr SUsage operator|(const SUsage& other) const
                 {
                     SUsage result;
                     result.sampledImage = sampledImage | other.sampledImage;
@@ -451,7 +451,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     return result;
                 }
 
-                inline SUsage operator ^ (const SUsage& other) const
+                constexpr SUsage operator^(const SUsage& other) const
                 {
                     SUsage result;
                     result.sampledImage = sampledImage ^ other.sampledImage;
@@ -467,7 +467,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     return result;
                 }
 
-                inline bool operator<(const SUsage& other) const
+                constexpr bool operator<(const SUsage& other) const
                 {
                     if (sampledImage && !other.sampledImage) return false;
                     if (storageImage && !other.storageImage) return false;
@@ -482,7 +482,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
                     return true;
                 }
 
-                inline bool operator == (const SUsage& other) const
+                constexpr bool operator==(const SUsage& other) const
                 {
                     return
                         (sampledImage == other.sampledImage) &&
@@ -528,7 +528,7 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
             EQF_NONE = 0,
             EQF_GRAPHICS_BIT = 0x01,
             EQF_COMPUTE_BIT = 0x02,
-            EQF_TRANSFER_BIT = 0x04,
+            EQF_TRANSFER_BIT = 0x04, // TODO: investigate whether GRAPHICS or COMPUTE can NOT report TRANSFER at the same time
             EQF_SPARSE_BINDING_BIT = 0x08,
             EQF_PROTECTED_BIT = 0x10
         };

include/nbl/video/utilities/SPhysicalDeviceFilter.h

@@ -27,6 +27,20 @@ namespace nbl::video
 
         struct QueueRequirement
         {
+            inline bool familyMatches(const IPhysicalDevice::SQueueFamilyProperties& props) const
+            {
+                if (!props.queueFlags.hasFlags(requiredFlags))
+                    return false;
+
+                // doesn't have disallowed flags
+                if ((props.queueFlags&disallowedFlags).value)
+                    return false;
+
+                return maxImageTransferGranularity.width >= props.minImageTransferGranularity.width &&
+                        maxImageTransferGranularity.height >= props.minImageTransferGranularity.height &&
+                        maxImageTransferGranularity.depth >= props.minImageTransferGranularity.depth;
+            }
+
             core::bitflag<IPhysicalDevice::E_QUEUE_FLAGS> requiredFlags = IPhysicalDevice::E_QUEUE_FLAGS::EQF_NONE;
             core::bitflag<IPhysicalDevice::E_QUEUE_FLAGS> disallowedFlags = IPhysicalDevice::E_QUEUE_FLAGS::EQF_NONE;
             uint32_t queueCount = 0u;
@@ -160,25 +174,11 @@ namespace nbl::video
                 for (uint32_t qfam = 0; qfam < queueProps.size(); ++qfam)
                 {
                     const auto& queueFamilyProps = queueProps[qfam];
-
-                    // has requiredFlags
-                    if (queueFamilyProps.queueFlags.hasFlags(queueReqs.requiredFlags))
-                    {
-                        // doesn't have disallowed flags
-                        if ((queueFamilyProps.queueFlags & queueReqs.disallowedFlags).value == 0)
-                        {
-                            // imageTransferGranularity
-                            if (queueReqs.maxImageTransferGranularity.width >= queueFamilyProps.minImageTransferGranularity.width &&
-                                queueReqs.maxImageTransferGranularity.height >= queueFamilyProps.minImageTransferGranularity.height &&
-                                queueReqs.maxImageTransferGranularity.depth >= queueFamilyProps.minImageTransferGranularity.depth)
-                            {
-                                queueCount = (queueFamilyProps.queueCount > queueCount) ? 0ull : queueCount - queueFamilyProps.queueCount;
-                            }
-                        }
-                    }
+                    if (queueReqs.familyMatches(queueFamilyProps))
+                        queueCount -= core::min(queueFamilyProps.queueCount,queueCount);
                 }
 
-                if (queueCount > 0)
+                if (queueCount>0)
                     return false;
             }