make more operator bool() explicit, notice a missing _BIT suffix in a BLAS flag, add a CAssetConverter::SReserveResult::moveGPUObjects, make IPreHashed helpers more const poiter friendly

Author: devshgraphicsprogramming

include/nbl/asset/IAccelerationStructure.h

@@ -76,7 +76,8 @@ class IBottomLevelAccelerationStructure : public IAccelerationStructure
 			// Provided by VK_NV_displacement_micromap
 			ALLOW_DISPLACEMENT_MICROMAP_UPDATE_BIT = 0x1u<<9u,
 			// Provided by VK_KHR_ray_tracing_position_fetch
-			ALLOW_DATA_ACCESS = 0x1u<<11u,
+			ALLOW_DATA_ACCESS_BIT = 0x1u<<11u,
+			ALLOW_DATA_ACCESS = ALLOW_DATA_ACCESS_BIT // deprecated
 		};
 
 

include/nbl/asset/IGeometry.h

@@ -176,7 +176,7 @@ class IGeometryBase : public virtual core::IReferenceCounted
         struct SDataViewBase
         {
             // mostly checking validity of the format
-            inline operator bool() const {return format==EF_UNKNOWN || !isBlockCompressionFormat(format) && !isDepthOrStencilFormat(format);}
+            explicit inline operator bool() const {return format==EF_UNKNOWN || !isBlockCompressionFormat(format) && !isDepthOrStencilFormat(format);}
 
             //
             inline bool isFormatted() const {return format!=EF_UNKNOWN && bool(*this);}
@@ -294,7 +294,7 @@ class IGeometry : public std::conditional_t<std::is_same_v<BufferType,ICPUBuffer
 
         struct SDataView
         {
-            inline operator bool() const {return src && composed;}
+            explicit inline operator bool() const {return src && composed;}
 
             //
             explicit inline operator SBufferBinding<const BufferType>() const

include/nbl/asset/IMorphTargets.h

@@ -22,7 +22,7 @@ class NBL_API2 IMorphTargets : public virtual core::IReferenceCounted
             inline index_t() = default;
             explicit inline index_t(uint32_t _value) : value(_value) {}
 
-            inline operator bool() const {return value!=(~0u);}
+            explicit inline operator bool() const {return value!=(~0u);}
 
             uint32_t value = ~0u;
         };
@@ -68,7 +68,7 @@ class NBL_API2 IMorphTargets : public virtual core::IReferenceCounted
 
         struct STarget
         {
-            inline operator bool() const
+            explicit inline operator bool() const
             {
                 if (!geoCollection)
                     return false;

include/nbl/asset/IPolygonGeometry.h

@@ -208,7 +208,7 @@ class IPolygonGeometry : public IIndexableGeometry<BufferType>, public IPolygonG
         struct SJointWeight
         {
             // one thing this doesn't check is whether every vertex has a weight and index
-            inline operator bool() const {return indices && isIntegerFormat(indices.composed.format) && weights && weights.composed.isFormatted() && indices.getElementCount()==weights.getElementCount();}
+            explicit inline operator bool() const {return indices && isIntegerFormat(indices.composed.format) && weights && weights.composed.isFormatted() && indices.getElementCount()==weights.getElementCount();}
 
             SDataView indices;
             // Assumption is that only non-zero weights are present, which is why the joints are indexed (sparseness)

include/nbl/asset/IPreHashed.h

@@ -39,7 +39,7 @@ class IPreHashed : public IAsset
 				discardContent_impl();
 		}
 
-    static inline void discardDependantsContents(const std::span<IAsset*> roots)
+    static inline void discardDependantsContents(const std::span<IAsset* const> roots)
     {
       core::vector<IAsset*> stack;
       core::unordered_set<IAsset*> alreadyVisited; // whether we have push the node to the stack

include/nbl/asset/IRenderpass.h

@@ -302,7 +302,7 @@ class NBL_API2 IRenderpass
             uint32_t dependencyCount = 0u;
             int8_t viewMaskMSB = -1;
 
-            inline operator bool() const {return subpassCount;}
+            explicit inline operator bool() const {return subpassCount;}
 
             inline bool hasViewMasks() const {return viewMaskMSB>=0;}
         };

include/nbl/video/IGPUPipeline.h

@@ -90,7 +90,7 @@ class IGPUPipelineBase {
                     .count = dataSize ? static_cast<uint32_t>(count) : 0,
                     .dataSize = static_cast<uint32_t>(dataSize),
                 };
-                return *retval;
+                return bool(*retval);
             }
 
             const asset::IShader* shader = nullptr;

include/nbl/video/ILogicalDevice.h

@@ -410,7 +410,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
         //
         struct AccelerationStructureBuildSizes
         {
-            inline operator bool() const { return accelerationStructureSize!=(~0ull); }
+            explicit inline operator bool() const { return accelerationStructureSize!=(~0ull); }
 
             size_t accelerationStructureSize = ~0ull;
             size_t updateScratchSize = ~0ull;

include/nbl/video/SPipelineCreationParams.h

@@ -14,7 +14,7 @@ namespace nbl::video
 struct SSpecializationValidationResult
 {
   constexpr static inline uint32_t Invalid = ~0u;
-  inline operator bool() const
+  explicit inline operator bool() const
   {
     return count!=Invalid && dataSize!=Invalid;
   }

include/nbl/video/utilities/CAssetConverter.h

@@ -1048,14 +1048,24 @@ class CAssetConverter : public core::IReferenceCounted
 				}
 
 				//
-				inline operator bool() const {return bool(m_converter);}
+				explicit inline operator bool() const {return bool(m_converter);}
 
 				// Until `convert` is called, the Buffers and Images are not filled with content and Acceleration Structures are not built, unless found in the `SInput::readCache`
 				// WARNING: The Acceleration Structure Pointer WILL CHANGE after calling `convert` if its patch dictates that it will be compacted! (since AS can't resize)
 				// TODO: we could also return per-object semaphore values when object is ready for use (would have to propagate two semaphores up through dependants)
 				template<asset::Asset AssetType>
 				std::span<const asset_cached_t<AssetType>> getGPUObjects() const {return std::get<vector_t<AssetType>>(m_gpuObjects);}
 
+				// after a successful conversion you can move the GPU objects over
+				template<asset::Asset AssetType>
+				bool moveGPUObjects(vector_t<AssetType>& out)
+				{
+					if (m_converter)
+						return false;
+					out = std::move(std::get<vector_t<AssetType>>(m_gpuObjects));
+					return true;
+				}
+
 				// If you ever need to look up the content hashes of the assets AT THE TIME you converted them
 				// REMEMBER it can have stale hashes (asset or its dependants mutated since hash computed),
 				// then you can get hash mismatches or plain wrong hashes.
@@ -1106,7 +1116,7 @@ class CAssetConverter : public core::IReferenceCounted
 
 				// we don't insert into the writeCache until conversions are successful
 				core::tuple_transform_t<staging_cache_t,supported_asset_types> m_stagingCaches;
-        // converted IShaders do not have any object that hold a smartptr into them, so we have to persist them in this vector to prevent m_stagingCacheds hold a raw dangling pointer into them
+				// converted IShaders do not have any object that hold a smartptr into them, so we have to persist them in this vector to prevent m_stagingCacheds hold a raw dangling pointer into them
 				core::vector<core::smart_refctd_ptr<asset::IShader>> m_shaders;
 
 				// need a more explicit list of GPU objects that need device-assisted conversion