fix some more issues, write down an idea

Author: devshgraphicsprogramming

include/nbl/asset/ISkeleton.h

@@ -79,13 +79,14 @@ namespace asset
 			}
 
 			// map must contain one `const char*` per bone
-			inline void setJointNames(const decltype(m_nameToJointID)& nameToJointIDMap)
+			template<class Comparator>
+			inline void setJointNames(const core::map<const char*,joint_id_t,Comparator>& nameToJointIDMap)
 			{
 				clearNames();
 
 				// size the pool
 				for (const auto& mapping : nameToJointIDMap)
-					inName(mapping.first);
+					reserveName(mapping.first);
 
 				// useless names
 				if (m_stringPoolSize==0ull)
@@ -106,7 +107,7 @@ namespace asset
 
 				// size the pool
 				for (auto it=begin; it!=end; it++)
-					inName(*it);
+					reserveName(*it);
 
 				// useless names
 				if (m_stringPoolSize==0ull)
@@ -141,7 +142,7 @@ namespace asset
 				if (nameLen)
 					m_stringPoolSize += nameLen+1ull;
 			}
-			inline const char* insertName(const char* outName, const char* inName, joint_id_t jointID)
+			inline char* insertName(char* outName, const char* inName, joint_id_t jointID)
 			{
 				const char* name = outName;
 				while (*inName) {*(outName++) = *(inName++);}

include/nbl/video/IGPUSkeleton.h

@@ -18,10 +18,11 @@ class IGPUSkeleton final : public asset::ISkeleton<IGPUBuffer>
         using base_t = asset::ISkeleton<IGPUBuffer>;
 
     public:
-		inline IGPUSkeleton(asset::SBufferBinding<IGPUBuffer>&& _parentJointIDsBinding, asset::SBufferBinding<IGPUBuffer>&& _inverseBindPosesBinding, const decltype(m_nameToJointID)& nameToJointIDMap) :
+		template<class Comparator>
+		inline IGPUSkeleton(asset::SBufferBinding<IGPUBuffer>&& _parentJointIDsBinding, asset::SBufferBinding<IGPUBuffer>&& _inverseBindPosesBinding, const core::map<const char*,joint_id_t,Comparator>& nameToJointIDMap) :
 			base_t(std::move(_parentJointIDsBinding),std::move(_inverseBindPosesBinding),nameToJointIDMap.size())
 		{
-			base_t::setJointNames(nameToJointIDMap);
+			base_t::setJointNames<Comparator>(nameToJointIDMap);
 		}
 
 		template<typename NameIterator>

source/Nabla/IDriver.cpp

@@ -112,6 +112,7 @@ template created_gpu_object_array<asset::ICPUDescriptorSetLayout> IDriver::getGP
 template created_gpu_object_array<asset::ICPUSampler> IDriver::getGPUObjectsFromAssets<asset::ICPUSampler>(const asset::ICPUSampler* const* const, const asset::ICPUSampler* const* const, IGPUObjectFromAssetConverter* _converter);
 template created_gpu_object_array<asset::ICPUDescriptorSet> IDriver::getGPUObjectsFromAssets<asset::ICPUDescriptorSet>(const asset::ICPUDescriptorSet* const* const, const asset::ICPUDescriptorSet* const* const, IGPUObjectFromAssetConverter* _converter);
 
+
 template<typename AssetType>
 created_gpu_object_array<AssetType> IDriver::getGPUObjectsFromAssets(const core::smart_refctd_ptr<AssetType>* _begin, const core::smart_refctd_ptr<AssetType>* _end, IGPUObjectFromAssetConverter* _converter)
 {
@@ -136,6 +137,38 @@ template created_gpu_object_array<asset::ICPUDescriptorSetLayout> IDriver::getGP
 template created_gpu_object_array<asset::ICPUSampler> IDriver::getGPUObjectsFromAssets<asset::ICPUSampler>(const core::smart_refctd_ptr<asset::ICPUSampler>*, const core::smart_refctd_ptr<asset::ICPUSampler>*, IGPUObjectFromAssetConverter* _converter);
 template created_gpu_object_array<asset::ICPUDescriptorSet> IDriver::getGPUObjectsFromAssets<asset::ICPUDescriptorSet>(const core::smart_refctd_ptr<asset::ICPUDescriptorSet>*, const core::smart_refctd_ptr<asset::ICPUDescriptorSet>*, IGPUObjectFromAssetConverter* _converter);
 
+
+// TODO: would be nice if something like this worked... eh might have to resort to a Macro
+#if 0
+template<typename AssetType>
+struct SingleFunctionInstantiator
+{
+protected:
+    static auto instantiate(IDriver* driver)
+    {
+        core::smart_refctd_ptr<AssetType> smartptr;
+
+        created_gpu_object_array<AssetType> retval = driver->getGPUObjectsFromAssets<AssetType>(core::SRange<const core::smart_refctd_ptr<asset::IAsset>>(nullptr, nullptr), nullptr);
+        retval = driver->getGPUObjectsFromAssets<AssetType>(&smartptr.get(), &smartptr.get(), nullptr);
+        retval = driver->getGPUObjectsFromAssets<AssetType>(&smartptr, &smartptr, nullptr);
+        return retval;
+    }
+};
+template<typename... AssetTypes>
+struct MultiFunctionInstantiator : public SingleFunctionInstantiator<AssetTypes>...
+{
+};
+
+template MultiFunctionInstantiator<asset::ICPUBuffer,
+    asset::ICPUShader, asset::ICPUImage, asset::ICPUSkeleton,
+    asset::ICPUSpecializedShader, asset::ICPUImageView, asset::ICPUSampler,
+    asset::ICPUDescriptorSetLayout,
+    asset::ICPUDescriptorSet, asset::ICPUPipelineLayout,
+    asset::ICPUComputePipeline, asset::ICPURenderpassIndependentPipeline,
+    asset::ICPUMeshBuffer,
+    asset::ICPUMesh
+>;
+#endif
 }
 }