Merge branch 'separable_image_sampler' into separable_image_sampler_amortized_lookups. Also cleanup + AoS changes for amortized lookups

Fletterio · Fletterio · commit 1514b532328a · 2024-07-06T16:50:08.000-03:00
diff --git a/.gitmodules b/.gitmodules
@@ -96,3 +96,6 @@
 [submodule "3rdparty/blake"]
 	path = 3rdparty/blake
 	url = git@github.com:Devsh-Graphics-Programming/BLAKE3.git
+[submodule "3rdparty/imguizmo"]
+	path = 3rdparty/imguizmo
+	url = git@github.com:Devsh-Graphics-Programming/ImGuizmo.git
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -292,6 +292,9 @@ if(NBL_BUILD_IMGUI)
 	else()
 		target_compile_options(implot PRIVATE -Wall -Wextra -pedantic -Werror -mavx2 -Ofast)
 	endif()
+	
+	set(IMGUIZMO_BUILD_EXAMPLE OFF)
+	add_subdirectory(imguizmo EXCLUDE_FROM_ALL)
 endif()
 
 add_library(aesGladman OBJECT
@@ -384,7 +387,7 @@ if (NBL_BUILD_MITSUBA_LOADER)
 	list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
 if (NBL_BUILD_IMGUI)
-	list(APPEND NBL_3RDPARTY_TARGETS imgui)
+	list(APPEND NBL_3RDPARTY_TARGETS imgui implot imguizmo)
 endif()
 if(ENABLE_HLSL)
 	list(APPEND NBL_3RDPARTY_TARGETS HLSL)
diff --git a/3rdparty/imguizmo b/3rdparty/imguizmo
@@ -0,0 +1 @@
+Subproject commit 6f4b2197efd715d16b19775b00f36c6c6f5aacb6
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -53,7 +53,9 @@ Below are some tasks that are open for contribution. If you start working on a t
 - Radix Sort (Vulkan Compute)
 - Bitonic Sort (Vulkan Compute)
 - Merge Path (Vulkan Compute)
-- [GPU flip fluid simulation task idea](https://www.youtube.com/watch?v=okQzAJM7LcE) -> discord [thread](https://discord.com/channels/318590007881236480/374061825454768129/1257988553112027186) for more info  
+- [GPU flip fluid simulation task idea](https://www.youtube.com/watch?v=okQzAJM7LcE) -> discord [thread](https://discord.com/channels/318590007881236480/374061825454768129/1257988553112027186) for more info
+- [Exact Distance Transform on a GPU](https://docs.google.com/document/d/1iUF0ilFbWVWr5JfPtR8D8z7OdmbhUJXK-eoR_7u4-50/edit)
+- [Light Scattering Effects Using Epipolar Sampling and 1D Min/Max Binary Trees](https://ubm-twvideo01.s3.amazonaws.com/o1/vault/gdc2013/slides/822368Yusov_Egor_Practical_Implementation_of_Light.pdf)
 
  **[Issues](https://github.com/Devsh-Graphics-Programming/Nabla/issues) also count as free tasks.** We also have old issues from previous generation **[here](https://github.com/buildaworldnet/IrrlichtBAW/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc)**.
 
diff --git a/examples_tests b/examples_tests
@@ -1 +1 @@
-Subproject commit d478a92baf92572434454bf624ad0821b79705f6
+Subproject commit daea3f951b59a4b53cec81c44786f5934994176e
diff --git a/include/nbl/asset/ICPUDescriptorSet.h b/include/nbl/asset/ICPUDescriptorSet.h
@@ -99,10 +99,6 @@ class NBL_API2 ICPUDescriptorSet final : public IDescriptorSet<ICPUDescriptorSet
 		virtual ~ICPUDescriptorSet() = default;
 
 	private:
-		static inline IDescriptor::E_CATEGORY getCategoryFromType(const IDescriptor::E_TYPE type)
-		{
-			return IDescriptor::GetTypeCategory(type);
-		}
 
 		core::smart_refctd_dynamic_array<ICPUDescriptorSet::SDescriptorInfo> m_descriptorInfos[static_cast<uint32_t>(IDescriptor::E_TYPE::ET_COUNT)];
 };
diff --git a/include/nbl/asset/IDescriptorSet.h b/include/nbl/asset/IDescriptorSet.h
@@ -95,18 +95,23 @@ class IDescriptorSet : public virtual core::IReferenceCounted // TODO: try to re
 				}
 				~SDescriptorInfo()
 				{
+					if (desc && desc->getTypeCategory() == IDescriptor::EC_IMAGE)
+						info.combinedImageSampler.sampler = nullptr;
 				}
 
 				inline SDescriptorInfo& operator=(const SDescriptorInfo& other)
 				{
 					if (desc and desc->getTypeCategory()==IDescriptor::EC_IMAGE)
 						info.combinedImageSampler.sampler = nullptr;
 					desc = other.desc;
-					const auto type = desc->getTypeCategory();
-					if (type!=IDescriptor::EC_IMAGE)
-						info.buffer = other.info.buffer;
-					else
-						info.combinedImageSampler = other.info.combinedImageSampler;
+					if (desc)
+					{
+						const auto type = desc->getTypeCategory();
+						if (type != IDescriptor::EC_IMAGE)
+							info.buffer = other.info.buffer;
+						else
+							info.combinedImageSampler = other.info.combinedImageSampler;
+					}
 					return *this;
 				}
 				inline SDescriptorInfo& operator=(SDescriptorInfo&& other)
diff --git a/include/nbl/asset/IDescriptorSetLayout.h b/include/nbl/asset/IDescriptorSetLayout.h
@@ -57,9 +57,9 @@ class IDescriptorSetLayout : public virtual core::IReferenceCounted  // TODO: tr
 		core::bitflag<E_CREATE_FLAGS> createFlags;
 		core::bitflag<IShader::E_SHADER_STAGE> stageFlags;
 		uint32_t count;
-		// Use this if you want an immutable sampler that is baked into the DS layout itself.
-		// If its `nullptr` then the sampler used is mutable and can be specified while writing the image descriptor to a binding while updating the DS.
-		const core::smart_refctd_ptr<sampler_type>* samplers;
+		// Use this if you want immutable samplers that are baked into the DS layout itself.
+		// If it's `nullptr` then the samplers used are mutable and can be specified while writing the image descriptor to a binding while updating the DS.
+		const core::smart_refctd_ptr<sampler_type>* immutableSamplers;
 	};
 
 	// Maps a binding to a local (to descriptor set layout) offset.
@@ -412,13 +412,13 @@ class IDescriptorSetLayout : public virtual core::IReferenceCounted  // TODO: tr
 		{
 			switch (b.type) {
 				case IDescriptor::E_TYPE::ET_SAMPLER:
-					if (b.samplers)
+					if (b.immutableSamplers)
 						buildInfo_immutableSamplers.emplace_back(b.binding, b.createFlags, b.stageFlags, b.count);
 					else 
 						buildInfo_descriptors[size_t(IDescriptor::E_TYPE::ET_SAMPLER)].emplace_back(b.binding, b.createFlags, b.stageFlags, b.count);
 					break;
 				case IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER:
-					if (b.samplers)
+					if (b.immutableSamplers)
 						buildInfo_immutableSamplers.emplace_back(b.binding, b.createFlags, b.stageFlags, b.count);
 					else
 						buildInfo_mutableSamplers.emplace_back(b.binding, b.createFlags, b.stageFlags, b.count);
@@ -440,13 +440,13 @@ class IDescriptorSetLayout : public virtual core::IReferenceCounted  // TODO: tr
 
 		for (const auto& b : _bindings)
 		{
-			if ((b.type == IDescriptor::E_TYPE::ET_SAMPLER or b.type == IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and b.samplers)
+			if ((b.type == IDescriptor::E_TYPE::ET_SAMPLER or b.type == IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and b.immutableSamplers)
 			{
 				const auto localOffset = m_immutableSamplerRedirect.getStorageOffset(typename CBindingRedirect::binding_number_t(b.binding)).data;
 				assert(localOffset != m_immutableSamplerRedirect.Invalid);
 
 				auto* dst = m_immutableSamplers->begin() + localOffset;
-				std::copy_n(b.samplers, b.count, dst);
+				std::copy_n(b.immutableSamplers, b.count, dst);
 			}
 		}
 	}
diff --git a/include/nbl/asset/asset_utils.h b/include/nbl/asset/asset_utils.h
@@ -44,6 +44,8 @@ struct SBasicViewParameters
 } PACK_STRUCT;
 #include "nbl/nblunpack.h"
 
+static_assert(sizeof(SBasicViewParameters) == sizeof(float) * (4 * 4 + 2 * 3 * 4));
+
 }}
 
 #endif
diff --git a/include/nbl/asset/utils/IVirtualTexture.h b/include/nbl/asset/utils/IVirtualTexture.h
@@ -1049,7 +1049,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
             bnd.count = _count;
             bnd.stageFlags = asset::IShader::ESS_ALL;
             bnd.type = asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER;
-            bnd.samplers = _samplers;
+            bnd.immutableSamplers = _samplers;
         };
 
         fillBinding(bindings[0], _pgtBinding, 1u, samplers);
diff --git a/include/nbl/builtin/hlsl/type_traits.hlsl b/include/nbl/builtin/hlsl/type_traits.hlsl
@@ -392,6 +392,12 @@ struct enable_if<true, T> : type_identity<T> {};
 template<bool B, class T = void>
 using enable_if_t = typename enable_if<B, T>::type;
 
+template<class T>
+NBL_CONSTEXPR_STATIC_INLINE bool is_integral_v = is_integral<T>::value;
+
+template<class T>
+NBL_CONSTEXPR_STATIC_INLINE bool is_scalar_v = is_scalar<T>::value;
+
 template<class T>
 struct alignment_of;
 template<class T>
diff --git a/include/nbl/scene/ILevelOfDetailLibrary.h b/include/nbl/scene/ILevelOfDetailLibrary.h
@@ -213,7 +213,7 @@ class ILevelOfDetailLibrary : public virtual core::IReferenceCounted
 				bindings[i].type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER;
 				bindings[i].count = 1u;
 				bindings[i].stageFlags = asset::IShader::ESS_COMPUTE;
-				bindings[i].samplers = nullptr;
+				bindings[i].immutableSamplers = nullptr;
 			}
 			return device->createDescriptorSetLayout(bindings);
 		}
diff --git a/include/nbl/video/IGPUDescriptorSet.h b/include/nbl/video/IGPUDescriptorSet.h
@@ -89,10 +89,29 @@ class IGPUDescriptorSet : public asset::IDescriptorSet<const IGPUDescriptorSetLa
 
         using redirect_t = IGPUDescriptorSetLayout::CBindingRedirect;
         friend class ILogicalDevice;
-        asset::IDescriptor::E_TYPE validateWrite(const IGPUDescriptorSet::SWriteDescriptorSet& write, redirect_t::storage_range_index_t& descriptorRedirectBindingIndex, redirect_t::storage_range_index_t& mutableSamplerRedirectBindingIndex) const;
-        void processWrite(const IGPUDescriptorSet::SWriteDescriptorSet& write, const asset::IDescriptor::E_TYPE type, const redirect_t::storage_range_index_t descriptorRedirectBindingIndex, const redirect_t::storage_range_index_t mutableSamplerRedirectBindingIndex);
-        bool validateCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy, asset::IDescriptor::E_TYPE& type, redirect_t::storage_range_index_t& srcDescriptorRedirectBindingIndex, redirect_t::storage_range_index_t& dstDescriptorRedirectBindingIndex, redirect_t::storage_range_index_t& srcMutableSamplerRedirectBindingIndex, redirect_t::storage_range_index_t& dstMutableSamplerRedirectBindingIndex) const;
-        void processCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy, const asset::IDescriptor::E_TYPE type, const redirect_t::storage_range_index_t srcDescriptorRedirectBindingIndex, const redirect_t::storage_range_index_t dstDescriptorRedirectBindingIndex, const redirect_t::storage_range_index_t srcMutableSamplerRedirectBindingIndex, const redirect_t::storage_range_index_t dstMutableSamplerRedirectBindingIndex);
+
+        struct SWriteValidationResult
+        {
+            asset::IDescriptor::E_TYPE type;
+            redirect_t::storage_range_index_t descriptorRedirectBindingIndex;
+            redirect_t::storage_range_index_t mutableSamplerRedirectBindingIndex;
+        };
+
+        SWriteValidationResult validateWrite(const IGPUDescriptorSet::SWriteDescriptorSet& write) const;
+        void processWrite(const IGPUDescriptorSet::SWriteDescriptorSet& write, const SWriteValidationResult& validationResult);
+        
+        struct SCopyValidationResult
+        {
+            asset::IDescriptor::E_TYPE type;
+            redirect_t::storage_range_index_t srcDescriptorRedirectBindingIndex;
+            redirect_t::storage_range_index_t dstDescriptorRedirectBindingIndex;
+            redirect_t::storage_range_index_t srcMutableSamplerRedirectBindingIndex;
+            redirect_t::storage_range_index_t dstMutableSamplerRedirectBindingIndex;
+        };
+        
+        SCopyValidationResult validateCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy) const;
+        void processCopy(const IGPUDescriptorSet::SCopyDescriptorSet& copy, const SCopyValidationResult& validationResult);
+        
         void dropDescriptors(const IGPUDescriptorSet::SDropDescriptorSet& drop);
 
         // This assumes that descriptors of a particular type in the set will always be contiguous in pool's storage memory, regardless of which binding in the set they belong to.
diff --git a/include/nbl/video/utilities/CDumbPresentationOracle.h b/include/nbl/video/utilities/CDumbPresentationOracle.h
@@ -10,7 +10,6 @@
 namespace nbl::video
 {
 
-#if 0 // TODO: port
 class CDumbPresentationOracle : public IPresentationOracle
 {
 	public:
@@ -19,8 +18,7 @@ class CDumbPresentationOracle : public IPresentationOracle
 			reset();
 		}
 
-		~CDumbPresentationOracle() {
-		}
+		~CDumbPresentationOracle() {}
 
 		inline void reportBeginFrameRecord() override
 		{
@@ -53,16 +51,16 @@ class CDumbPresentationOracle : public IPresentationOracle
 
 		inline double getDeltaTimeInMicroSeconds() const {return dt;}
 
-		inline std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, IGPUSemaphore* acquireSemaphore, IGPUFence* fence, uint32_t* imageNumber) override
+		inline std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, ISwapchain::SAcquireInfo info, uint32_t* imageNumber) override
 		{
-			swapchain->acquireNextImage(acquireSemaphore,fence,imageNumber);
+			swapchain->acquireNextImage(info, imageNumber);
 			reportEndFrameRecord();
 			const auto retval = getNextPresentationTimeStamp();
 			reportBeginFrameRecord();
 			return retval;
 		}
 
-		inline void present(ILogicalDevice* device, ISwapchain* swapchain, IQueue* queue, IGPUSemaphore* renderFinishedSemaphore, const uint32_t imageNumber) override
+		inline void present(ILogicalDevice* device, ISwapchain* swapchain, ISwapchain::SAcquireInfo info, const uint32_t imageNumber) override
 		{
 			// literally cant do anything here in this dumb algorithm
 		}
@@ -89,7 +87,6 @@ class CDumbPresentationOracle : public IPresentationOracle
 		std::chrono::steady_clock::time_point lastTime;
 		std::chrono::microseconds nextPresentationTimeStamp;
 };
-#endif
 
 }
 
diff --git a/include/nbl/video/utilities/IPresentationOracle.h b/include/nbl/video/utilities/IPresentationOracle.h
@@ -8,7 +8,6 @@
 
 namespace nbl::video
 {
-#if 0 // TODO: port
 class IPresentationOracle
 {
     public:
@@ -17,13 +16,12 @@ class IPresentationOracle
         virtual void reportEndFrameRecord() = 0;
 
         //! wraps image acquire, could inject timings and queries before and after to obtain frame presentation data
-        virtual std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, IGPUSemaphore* acquireSemaphore, IGPUFence* fence, uint32_t* imageNumber) = 0;
+        virtual std::chrono::microseconds acquireNextImage(ISwapchain* swapchain, ISwapchain::SAcquireInfo info, uint32_t* imageNumber) = 0;
 
         // TODO: Actually start using this in CommonAPI of the examples
         //! wraps image acquire, could inject timings and queries before and after to obtain frame presentation data
-        virtual void present(nbl::video::ILogicalDevice* device, nbl::video::ISwapchain* swapchain, nbl::video::IQueue* queue, nbl::video::IGPUSemaphore* renderFinishedSemaphore, const uint32_t imageNumer) = 0;
+        virtual void present(ILogicalDevice* device, ISwapchain* swapchain, ISwapchain::SAcquireInfo info, const uint32_t imageNumber) = 0;
 };
-#endif
 }
 
 #endif // __NBL_VIDEO_I_PRESENTATION_ORACLE__H_INCLUDED__
diff --git a/src/nbl/asset/IAssetManager.cpp b/src/nbl/asset/IAssetManager.cpp
@@ -245,7 +245,7 @@ void IAssetManager::insertBuiltinAssets()
     binding3.type = IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER;
     binding3.count = 1u;
     binding3.stageFlags = static_cast<asset::ICPUShader::E_SHADER_STAGE>(asset::ICPUShader::ESS_FRAGMENT);
-    binding3.samplers = nullptr;
+    binding3.immutableSamplers = nullptr;
 
     auto ds3Layout = core::make_smart_refctd_ptr<asset::ICPUDescriptorSetLayout>(&binding3, &binding3 + 1);
     addBuiltInToCaches(ds3Layout, "nbl/builtin/material/lambertian/singletexture/descriptor_set_layout/3"); // TODO find everything what has been using it so far
diff --git a/src/nbl/asset/ICPUDescriptorSet.cpp b/src/nbl/asset/ICPUDescriptorSet.cpp
@@ -57,7 +57,7 @@ core::smart_refctd_ptr<IAsset> ICPUDescriptorSet::clone(uint32_t _depth) const
 			const auto& srcDescriptorInfo = m_descriptorInfos[t]->begin()[i];
 			auto& dstDescriptorInfo = cp->m_descriptorInfos[t]->begin()[i];
 
-			auto category = getCategoryFromType(type);
+			auto category = IDescriptor::GetTypeCategory(type);
 			
 			if (category == IDescriptor::E_CATEGORY::EC_IMAGE)
 				dstDescriptorInfo.info.combinedImageSampler = srcDescriptorInfo.info.combinedImageSampler;
@@ -127,7 +127,7 @@ void ICPUDescriptorSet::convertToDummyObject(uint32_t referenceLevelsBelowToConv
 			auto descriptorInfos = m_descriptorInfos[t]->begin();
 			assert(descriptorInfos);
 
-			const auto category = getCategoryFromType(type);
+			const auto category = IDescriptor::GetTypeCategory(type);
 			for (uint32_t i = 0u; i < descriptorCount; ++i)
 			{
 				switch (category)
@@ -183,7 +183,7 @@ void ICPUDescriptorSet::restoreFromDummy_impl(IAsset* _other, uint32_t _levelsBe
 
 			auto otherDescriptorInfos = other->m_descriptorInfos[t]->begin();
 
-			const auto category = getCategoryFromType(type);
+			const auto category = IDescriptor::GetTypeCategory(type);
 			for (uint32_t i = 0u; i < descriptorCount; ++i)
 			{
 				switch (category)
@@ -234,7 +234,7 @@ bool ICPUDescriptorSet::isAnyDependencyDummy_impl(uint32_t _levelsBelow) const
 			auto descriptorInfos = m_descriptorInfos[t]->begin();
 			assert(descriptorInfos);
 
-			const auto category = getCategoryFromType(type);
+			const auto category = IDescriptor::GetTypeCategory(type);
 			for (uint32_t i = 0u; i < descriptorCount; ++i)
 			{
 				switch (category)
diff --git a/src/nbl/ext/ImGui/ImGui.cpp b/src/nbl/ext/ImGui/ImGui.cpp
@@ -766,7 +766,7 @@ namespace nbl::ext::imgui
 		for (auto const& subscriber : m_subscribers)
 			subscriber.listener();
 
-		ImGui::Render();
+		ImGui::Render(); // note it doesn't touch GPU or graphics API at all, internal call - open the function def for more details
 	}
 
 	void UI::BeginWindow(char const* windowName)
diff --git a/src/nbl/video/CVulkanLogicalDevice.cpp b/src/nbl/video/CVulkanLogicalDevice.cpp
@@ -551,13 +551,13 @@ core::smart_refctd_ptr<IGPUDescriptorSetLayout> CVulkanLogicalDevice::createDesc
         vkDescSetLayoutBinding.stageFlags = getVkShaderStageFlagsFromShaderStage(binding.stageFlags);
         vkDescSetLayoutBinding.pImmutableSamplers = nullptr;
 
-        if ((binding.type == asset::IDescriptor::E_TYPE::ET_SAMPLER or binding.type==asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and binding.samplers and binding.count)
+        if ((binding.type == asset::IDescriptor::E_TYPE::ET_SAMPLER or binding.type==asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER) and binding.immutableSamplers and binding.count)
         {
             // If descriptorType is VK_DESCRIPTOR_TYPE_SAMPLER or VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, and descriptorCount is not 0 and pImmutableSamplers is not NULL:
             // pImmutableSamplers must be a valid pointer to an array of descriptorCount valid VkSampler handles.
             const uint32_t samplerOffset = vk_samplers.size();
             for (uint32_t i=0u; i<binding.count; ++i)
-                vk_samplers.push_back(static_cast<const CVulkanSampler*>(binding.samplers[i].get())->getInternalObject());
+                vk_samplers.push_back(static_cast<const CVulkanSampler*>(binding.immutableSamplers[i].get())->getInternalObject());
             vkDescSetLayoutBinding.pImmutableSamplers = vk_samplers.data()+samplerOffset;
         }
     }
diff --git a/src/nbl/video/IGPUDescriptorSet.cpp b/src/nbl/video/IGPUDescriptorSet.cpp
diff --git a/src/nbl/video/ILogicalDevice.cpp b/src/nbl/video/ILogicalDevice.cpp

Original file line number	Diff line number	Diff line change
`@@ -95,18 +95,23 @@ class IDescriptorSet : public virtual core::IReferenceCounted // TODO: try to re`
`95`	`95`	`}`
`96`	`96`	`~SDescriptorInfo()`
`97`	`97`	`{`
	`98`	`+ if (desc && desc->getTypeCategory() == IDescriptor::EC_IMAGE)`
	`99`	`+ info.combinedImageSampler.sampler = nullptr;`
`98`	`100`	`}`
`99`	`101`
`100`	`102`	`inline SDescriptorInfo& operator=(const SDescriptorInfo& other)`
`101`	`103`	`{`
`102`	`104`	`if (desc and desc->getTypeCategory()==IDescriptor::EC_IMAGE)`
`103`	`105`	`info.combinedImageSampler.sampler = nullptr;`
`104`	`106`	`desc = other.desc;`
`105`		`- const auto type = desc->getTypeCategory();`
`106`		`- if (type!=IDescriptor::EC_IMAGE)`
`107`		`- info.buffer = other.info.buffer;`
`108`		`- else`
`109`		`- info.combinedImageSampler = other.info.combinedImageSampler;`
	`107`	`+ if (desc)`
	`108`	`+ {`
	`109`	`+ const auto type = desc->getTypeCategory();`
	`110`	`+ if (type != IDescriptor::EC_IMAGE)`
	`111`	`+ info.buffer = other.info.buffer;`
	`112`	`+ else`
	`113`	`+ info.combinedImageSampler = other.info.combinedImageSampler;`
	`114`	`+ }`
`110`	`115`	`return *this;`
`111`	`116`	`}`
`112`	`117`	`inline SDescriptorInfo& operator=(SDescriptorInfo&& other)`