test radix sort and fix a few unrelated bugs

Author: devshgraphicsprogramming

examples_tests/18.MitsubaLoader/main.cpp

@@ -212,7 +212,9 @@ int main()
 		asset::CQuantNormalCache* qnc = am->getMeshManipulator()->getQuantNormalCache();
 
 		auto serializedLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am);
-		auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs);
+		auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, fs);
+		serializedLoader->initialize();
+		mitsubaLoader->initialize();
 		am->addAssetLoader(std::move(serializedLoader));
 		am->addAssetLoader(std::move(mitsubaLoader));
 
@@ -327,7 +329,11 @@ int main()
 	// look out for this!!!
 	// when added, CMitsubaLoader inserts its own include loader into GLSLCompiler
 	// thats why i have to add it again here (after device recreation) to be able to compile shaders
-	am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, device->getFileSystem()));
+	{
+		auto mitsubaLoader = core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, fs);
+		mitsubaLoader->initialize();
+		am->addAssetLoader(std::move(mitsubaLoader));
+	}
 
 	core::smart_refctd_ptr<asset::ICPUDescriptorSetLayout> ds2layout;
 	{

include/nbl/core/algorithm/radix_sort.h

@@ -61,11 +61,11 @@ struct RadixSorter
 		template<class RandomIt, class KeyAccessor>
 		inline RandomIt operator()(RandomIt input, RandomIt output, const histogram_t rangeSize, const KeyAccessor& comp)
 		{
-			return impl<RandomIt,KeyAccessor,0ull>(input,output,rangeSize,comp);
+			return pass<RandomIt,KeyAccessor,0ull>(input,output,rangeSize,comp);
 		}
 	private:
 		template<class RandomIt, class KeyAccessor, size_t pass_ix>
-		inline RandomIt impl(RandomIt input, RandomIt output, const histogram_t rangeSize, const KeyAccessor& comp)
+		inline RandomIt pass(RandomIt input, RandomIt output, const histogram_t rangeSize, const KeyAccessor& comp)
 		{
 			// clear
 			std::fill_n(histogram,histogram_size,static_cast<histogram_t>(0u));
@@ -80,7 +80,7 @@ struct RadixSorter
 				output[--histogram[comp.operator()<shift,radix_mask>(input[i])]] = input[i];
 
 			if constexpr (pass_ix != last_pass)
-				return impl<RandomIt,KeyAccessor,pass_ix+1ull>(output,input,rangeSize,comp);
+				return pass<RandomIt,KeyAccessor,pass_ix+1ull>(output,input,rangeSize,comp);
 			else
 				return output;
 		}

src/nbl/asset/utils/CSmoothNormalGenerator.cpp

@@ -132,12 +132,15 @@ void CSmoothNormalGenerator::VertexHashMap::validate()
 {
 	const auto oldSize = vertices.size();
 	vertices.resize(oldSize*2u);
+	// TODO: maybe use counting sort (or big radix) and use the histogram directly for the buckets
 	auto finalSortedOutput = core::radix_sort(vertices.data(),vertices.data()+oldSize,oldSize,KeyAccessor());
+	// TODO: optimize out the erase
 	if (finalSortedOutput!=vertices.data())
 		vertices.erase(vertices.begin(),vertices.begin()+oldSize);
 	else
 		vertices.erase(vertices.begin()+oldSize,vertices.end());
 
+	// TODO: are `buckets` even begin USED!?
 	uint16_t prevHash = vertices[0].hash;
 	core::vector<IMeshManipulator::SSNGVertexData>::iterator prevBegin = vertices.begin();
 	buckets.push_back(prevBegin);