Merge remote-tracking branch 'remotes/origin/yas_phmap_replace'

Author: devsh

.gitmodules

@@ -36,9 +36,6 @@
 [submodule "3rdparty/gli"]
 	path = 3rdparty/gli
 	url = git@github.com:Devsh-Graphics-Programming/gli.git
-[submodule "3rdparty/parallel-hashmap"]
-	path = 3rdparty/parallel-hashmap
-	url = git@github.com:Devsh-Graphics-Programming/parallel-hashmap.git
 [submodule "3rdparty/jitify"]
 	path = 3rdparty/jitify
 	url = git@github.com:Devsh-Graphics-Programming/jitify.git
@@ -121,3 +118,6 @@
 [submodule "docker/msvc-winsdk"]
 	path = docker/msvc-winsdk
 	url = ../docker-nanoserver-msvc-winsdk
+[submodule "3rdparty/gtl"]
+	path = 3rdparty/gtl
+	url = https://github.com/greg7mdp/gtl.git

3rdparty/CMakeLists.txt

@@ -522,7 +522,7 @@ add_dependencies(3rdparty ${NBL_3RDPARTY_TARGETS})
 
 NBL_ADJUST_FOLDERS(3rdaprty)
 
-nbl_install_dir("${CMAKE_CURRENT_SOURCE_DIR}/parallel-hashmap/parallel_hashmap")
+nbl_install_dir("${CMAKE_CURRENT_SOURCE_DIR}/gtl/include")
 
 # parent scope exports, must be at the end of the file
 set(_NBL_3RDPARTY_TARGETS_ 

3rdparty/gtl

@@ -10,7 +10,7 @@
 #include <limits>
 #include <cmath>
 
-#include "parallel-hashmap/parallel_hashmap/phmap_dump.h"
+#include "gtl/include/gtl/phmap_dump.hpp"
 
 
 #include "nbl/core/declarations.h"
@@ -488,7 +488,7 @@ class CDirQuantCacheBase : public virtual core::IReferenceCounted, public impl::
 		template<E_FORMAT CacheFormat>
 		static inline size_t getSerializedCacheSizeInBytes_impl(size_t capacity)
 		{
-			return 1u+sizeof(size_t)*2u+phmap::priv::Group::kWidth+(sizeof(typename cache_type_t<CacheFormat>::slot_type)+1u)*capacity;
+			return 1u+sizeof(size_t)*2u+gtl::priv::Group::kWidth+(sizeof(typename cache_type_t<CacheFormat>::slot_type)+1u)*capacity;
 		}
 		template<E_FORMAT CacheFormat>
 		static inline bool validateSerializedCache(const SBufferRange<const ICPUBuffer>& buffer)

3rdparty/parallel-hashmap

@@ -28,7 +28,7 @@ class CBufferPhmapInputArchive
 		}
 
 		template<typename V>
-		typename std::enable_if<phmap::type_traits_internal::IsTriviallyCopyable<V>::value,bool>::type loadBinary(V* v)
+		typename std::enable_if<gtl::type_traits_internal::IsTriviallyCopyable<V>::value,bool>::type loadBinary(V* v)
 		{
 			memcpy(reinterpret_cast<uint8_t*>(v), buffPtr, sizeof(V));
 			buffPtr += sizeof(V);

include/nbl/asset/utils/CDirQuantCacheBase.h

@@ -28,7 +28,7 @@ class CBufferPhmapOutputArchive
 		}
 
 		template<typename V>
-		typename std::enable_if<phmap::type_traits_internal::IsTriviallyCopyable<V>::value,bool>::type saveBinary(const V& v)
+		typename std::enable_if<gtl::type_traits_internal::IsTriviallyCopyable<V>::value,bool>::type saveBinary(const V& v)
 		{
 			memcpy(bufferPtr, reinterpret_cast<const uint8_t*>(&v), sizeof(V));
 			bufferPtr += sizeof(V);

include/nbl/asset/utils/phmap_deserialization.h

@@ -22,7 +22,7 @@
 #include <vector>
 #include <utility>
 #include <iterator>
-#include <parallel-hashmap/parallel_hashmap/phmap.h>
+#include <gtl/include/gtl/phmap.hpp>
 
 #include "nbl/core/memory/new_delete.h"
 
@@ -62,7 +62,7 @@ template<typename K, class Compare=std::less<K>, class Allocator=allocator<K> >
 using set = std::set<K,Compare,Allocator>;
 
 template<typename K,typename T, class Hash=std::hash<K>, class KeyEqual=std::equal_to<K>, class Allocator=allocator<std::pair<const K,T> > >
-using unordered_map = phmap::flat_hash_map<K,T,Hash,KeyEqual,Allocator>;
+using unordered_map = gtl::flat_hash_map<K, T, Hash, KeyEqual, Allocator>;
 //
 template<class Key,class T,class Hash,class KeyEqual,class Alloc,class Pred>
 unordered_map<Key,T,Hash,KeyEqual,Alloc>::size_type erase_if(unordered_map<Key,T,Hash,KeyEqual,Alloc>& c, Pred pred)
@@ -84,7 +84,7 @@ using unordered_multimap = std::unordered_multimap<K,T,Hash,KeyEqual,Allocator>;
 template<typename K, class Hash=std::hash<K>, class KeyEqual=std::equal_to<K>, class Allocator=allocator<K> >
 using unordered_multiset = std::unordered_multiset<K,Hash,KeyEqual,Allocator>;
 template<typename K, class Hash=std::hash<K>, class KeyEqual=std::equal_to<K>, class Allocator=allocator<K> >
-using unordered_set = phmap::flat_hash_set<K,Hash,KeyEqual,Allocator>;
+using unordered_set = gtl::flat_hash_set<K,Hash,KeyEqual,Allocator>;
 
 
 template<typename T, class Allocator=allocator<T> >

include/nbl/asset/utils/phmap_serialization.h

@@ -3721,7 +3721,7 @@ auto CAssetConverter::reserve(const SInputs& inputs) -> SReserveResult
 		auto pruneStaging = [&]<Asset AssetType>()->void
 		{
 			auto& stagingCache = std::get<SReserveResult::staging_cache_t<AssetType>>(retval.m_stagingCaches);
-			phmap::erase_if(stagingCache,[&retval](const auto& entry)->bool
+			gtl::erase_if(stagingCache,[&retval](const auto& entry)->bool
 				{
 					if (entry.first->getReferenceCount()==1)
 					{
@@ -5565,7 +5565,7 @@ ISemaphore::future_t<IQueue::RESULT> CAssetConverter::convert_impl(SReserveResul
 		auto checkDependents = [&]<Asset AssetType>()->void
 		{
 			auto& stagingCache = std::get<SReserveResult::staging_cache_t<AssetType>>(reservations.m_stagingCaches);
-			phmap::erase_if(stagingCache,[&](auto& item)->bool
+			gtl::erase_if(stagingCache,[&](auto& item)->bool
 				{
 					auto* pGpuObj = item.first;
 					// rescan all the GPU objects and find out if they depend on anything that failed, if so add to failure set