Merge pull request #547 from Crisspl/3rdparty-upgrade

Partial Asset Mutability Fix

Author: devshgraphicsprogramming

include/irr/asset/IAsset.h

@@ -208,7 +208,8 @@ class IAsset : virtual public core::IReferenceCounted
 
         void convertToDummyObject_common(uint32_t referenceLevelsBelowToConvert)
         {
-            isDummyObjectForCacheAliasing = true;
+			if (m_mutable)
+				isDummyObjectForCacheAliasing = true;
         }
 
 		//! Checks if the object is either not dummy or dummy but in some cache for a purpose

include/irr/asset/ICPUBuffer.h

@@ -65,6 +65,8 @@ class ICPUBuffer : public asset::IBuffer, public asset::IAsset
             if (isDummyObjectForCacheAliasing)
                 return;
             convertToDummyObject_common(referenceLevelsBelowToConvert);
+            if (!m_mutable)
+                return;
 
             if (data)
                 _IRR_ALIGNED_FREE(data);
@@ -135,6 +137,8 @@ class CCustomAllocatorCPUBuffer<Allocator, true> : public ICPUBuffer
             if (isDummyObjectForCacheAliasing)
                 return;
             convertToDummyObject_common(referenceLevelsBelowToConvert);
+            if (!m_mutable)
+                return;
 
 			if (ICPUBuffer::data)
 				m_allocator.deallocate(reinterpret_cast<typename Allocator::pointer>(ICPUBuffer::data), ICPUBuffer::size);

include/irr/asset/ICPUDescriptorSetLayout.h

@@ -59,15 +59,19 @@ class ICPUDescriptorSetLayout : public IDescriptorSetLayout<ICPUSampler>, public
                 return;
             convertToDummyObject_common(referenceLevelsBelowToConvert);
 
-			m_bindings = nullptr;
+            if (m_mutable)
+			    m_bindings = nullptr;
+
 			if (referenceLevelsBelowToConvert)
 			{
                 --referenceLevelsBelowToConvert;
 				if (m_samplers)
 				for (auto it=m_samplers->begin(); it!=m_samplers->end(); it++)
 					it->get()->convertToDummyObject(referenceLevelsBelowToConvert);
 			}
-			m_samplers = nullptr;
+
+            if (m_mutable)
+			    m_samplers = nullptr;
 		}
 
         _IRR_STATIC_INLINE_CONSTEXPR auto AssetType = ET_DESCRIPTOR_SET_LAYOUT;

include/irr/asset/ICPUImage.h

@@ -49,7 +49,9 @@ class ICPUImage final : public IImage, public IAsset
 			if (referenceLevelsBelowToConvert)
 			if (buffer)
 				buffer->convertToDummyObject(referenceLevelsBelowToConvert-1u);
-            regions = nullptr;
+
+			if (m_mutable)
+				regions = nullptr;
         }
 
 		_IRR_STATIC_INLINE_CONSTEXPR auto AssetType = ET_IMAGE;

include/irr/asset/ICPUPipelineCache.h

@@ -110,7 +110,8 @@ class ICPUPipelineCache final : public IAsset
 	size_t conservativeSizeEstimate() const override { return 0ull; /*TODO*/ }
 	void convertToDummyObject(uint32_t referenceLevelsBelowToConvert = 0u) override
 	{
-		m_cache.clear();
+		if (m_mutable)
+			m_cache.clear();
 	}
 
 	_IRR_STATIC_INLINE_CONSTEXPR auto AssetType = ET_PIPELINE_CACHE;

include/irr/asset/ICPUPipelineLayout.h

@@ -52,7 +52,9 @@ class ICPUPipelineLayout : public IAsset, public IPipelineLayout<ICPUDescriptorS
 			    for (auto it=m_descSetLayouts.begin(); it!=m_descSetLayouts.end(); it++)
 			        if (it->get())
 				        it->get()->convertToDummyObject(referenceLevelsBelowToConvert-1u);
-			m_pushConstantRanges = nullptr;
+
+            if (m_mutable)
+			    m_pushConstantRanges = nullptr;
 		}
 
         _IRR_STATIC_INLINE_CONSTEXPR auto AssetType = ET_PIPELINE_LAYOUT;

include/irr/asset/ICPUSpecializedShader.h

@@ -69,7 +69,8 @@ class ICPUSpecializedShader : public IAsset, public ISpecializedShader
 					//m_specInfo.getBackingBuffer()->convertToDummyObject(referenceLevelsBelowToConvert-1u);
 				m_unspecialized->convertToDummyObject(referenceLevelsBelowToConvert-1u);
 			}
-			m_specInfo.setEntries(nullptr,core::smart_refctd_ptr<ICPUBuffer>(m_specInfo.getBackingBuffer()));
+			if (m_mutable)
+				m_specInfo.setEntries(nullptr,core::smart_refctd_ptr<ICPUBuffer>(m_specInfo.getBackingBuffer()));
 		}
 
 		inline E_SHADER_STAGE getStage() const { return m_specInfo.shaderStage; }

src/irr/asset/CGraphicsPipelineLoaderMTL.cpp

@@ -234,6 +234,7 @@ core::smart_refctd_ptr<ICPUPipelineLayout> CGraphicsPipelineLoaderMTL::makePipel
     }
 
     auto ds1layout = getDefaultAsset<ICPUDescriptorSetLayout, IAsset::ET_DESCRIPTOR_SET_LAYOUT>("irr/builtin/descriptor_set_layout/basic_view_parameters", m_assetMgr);
+
     core::smart_refctd_ptr<ICPUDescriptorSetLayout> ds3Layout = _noDS3 ? nullptr : core::make_smart_refctd_ptr<ICPUDescriptorSetLayout>(bindings->begin(), bindings->end());
     SPushConstantRange pcRng;
     pcRng.stageFlags = ICPUSpecializedShader::ESS_FRAGMENT;