Merge pull request #756 from Devsh-Graphics-Programming/asset-conversion-v3

Asset conversion v3

Author: devshgraphicsprogramming

3rdparty/git-version-tracking

@@ -85,6 +85,13 @@ class IDescriptorSet : public virtual core::IReferenceCounted // TODO: try to re
 					info.buffer.offset = range.offset;
 					info.buffer.size = range.size;
 				}
+				template<typename ImageType>
+				SDescriptorInfo(const core::smart_refctd_ptr<IImageView<ImageType>>& image, const IImage::LAYOUT layout, const core::smart_refctd_ptr<typename layout_t::sampler_type>& sampler={}) : desc()
+				{
+					desc = image;
+					info.image.imageLayout = layout;
+					info.combinedImageSampler.sampler = sampler;
+				}
 				SDescriptorInfo(const SDescriptorInfo& other) : SDescriptorInfo()
 				{
 					operator=(other);

examples_tests

@@ -123,7 +123,7 @@ class IImageView : public IImageViewBase
 			// declared some usages but they are not a subset
 			{
 				// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkImageViewCreateInfo.html#VUID-VkImageViewCreateInfo-pNext-02663
-				if (subresourceRange.aspectMask.hasFlags(IImage::EAF_STENCIL_BIT) && !imgParams.stencilUsage.hasFlags(_params.subUsages))
+				if (subresourceRange.aspectMask.hasFlags(IImage::EAF_STENCIL_BIT) && !imgParams.actualStencilUsage().hasFlags(_params.subUsages))
 					return false;
 				// https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkImageViewCreateInfo.html#VUID-VkImageViewCreateInfo-pNext-02664
 				if ((subresourceRange.aspectMask.value&(~IImage::EAF_STENCIL_BIT)) && !imgParams.usage.hasFlags(_params.subUsages))

include/nbl/asset/IDescriptorSet.h

@@ -36,6 +36,7 @@ struct bitflag final
 	constexpr bool operator!=(const bitflag<ENUM_TYPE> rhs) const {return value!=rhs.value;}
 	constexpr bool operator==(const bitflag<ENUM_TYPE> rhs) const {return value==rhs.value;}
 	constexpr bool hasFlags(const bitflag<ENUM_TYPE> val) const {return (static_cast<UNDERLYING_TYPE>(value) & static_cast<UNDERLYING_TYPE>(val.value)) == static_cast<UNDERLYING_TYPE>(val.value);}
+	constexpr bool hasAnyFlag(const bitflag<ENUM_TYPE> val) const {return (static_cast<UNDERLYING_TYPE>(value) & static_cast<UNDERLYING_TYPE>(val.value)) != static_cast<UNDERLYING_TYPE>(0);}
 };
 
 template<typename T, typename Dummy>

include/nbl/asset/IImageView.h

@@ -59,7 +59,9 @@ class NBL_API2 IAPIConnection : public core::IReferenceCounted
 
         std::span<IPhysicalDevice* const> getPhysicalDevices() const;
 
-        const SFeatures& getEnabledFeatures() const { return m_enabledFeatures; };
+        const SFeatures& getEnabledFeatures() const { return m_enabledFeatures; }
+
+        const bool isRunningInRenderdoc() const { return m_rdoc_api; }
 
     protected:
         IAPIConnection(const SFeatures& enabledFeatures);

include/nbl/core/util/bitflag.h

@@ -78,6 +78,27 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
             return false;
         }
 
+        // This lets us know if not submitting this cmdbuf has no side-effects
+        // TODO: should we track the `bind` and `set{$DynamicState}` commands?
+        inline bool empty() const
+        {
+            switch (m_state)
+            {
+                case STATE::RECORDING:
+                    [[fallthrough]];
+                case STATE::EXECUTABLE:
+                    [[fallthrough]];
+                case STATE::PENDING:
+                    if (m_noCommands)
+                        return false;
+                    [[fallthrough]];
+                default:
+                    return true;
+            }
+        }
+        // if you use `getNativeHandle()` to record some custom commands between `begin()` and `end()`
+        inline void setNotEmtpy() {m_noCommands = true;}
+
         //! Begin, Reset, End
         enum class USAGE : uint8_t
         {
@@ -787,6 +808,7 @@ class NBL_API2 IGPUCommandBuffer : public IBackendObject
 
         uint64_t m_resetCheckedStamp;
         STATE m_state = STATE::INITIAL;
+        bool m_noCommands = true;
         // only useful while recording
         SInheritanceInfo m_cachedInheritanceInfo;
         core::bitflag<USAGE> m_recordingFlags = USAGE::NONE;