use pitch, move derivative map creation to utilities

Author: AnastaZIuk

.gitmodules

@@ -99,3 +99,9 @@
 [submodule "3rdparty/volk"]
 	path = 3rdparty/volk
 	url = https://github.com/zeux/volk.git
+[submodule "3rdparty/simdjson"]
+	path = 3rdparty/simdjson
+	url = https://github.com/simdjson/simdjson
+[submodule "3rdparty/glTFSampleModels"]
+	path = 3rdparty/glTFSampleModels
+	url = https://github.com/KhronosGroup/glTF-Sample-Models

include/nbl/asset/utils/CDerivativeMapCreator.h

@@ -3,6 +3,7 @@
 
 #include "nbl/asset/ICPUImage.h"
 #include "nbl/asset/ICPUImageView.h"
+#include "nbl/asset/filters/CNormalMapToDerivativeFilter.h"
 
 namespace nbl {
 namespace asset
@@ -16,6 +17,30 @@ class CDerivativeMapCreator
 
     static core::smart_refctd_ptr<asset::ICPUImage> createDerivativeMapFromHeightMap(asset::ICPUImage* _inImg, asset::ISampler::E_TEXTURE_CLAMP _uwrap, asset::ISampler::E_TEXTURE_CLAMP _vwrap, asset::ISampler::E_TEXTURE_BORDER_COLOR _borderColor);
     static core::smart_refctd_ptr<asset::ICPUImageView> createDerivativeMapViewFromHeightMap(asset::ICPUImage* _inImg, asset::ISampler::E_TEXTURE_CLAMP _uwrap, asset::ISampler::E_TEXTURE_CLAMP _vwrap, asset::ISampler::E_TEXTURE_BORDER_COLOR _borderColor);
+
+    static core::smart_refctd_ptr<asset::ICPUImage> createDerivativeMapFromNormalMap(asset::ICPUImage* _inImg);
+    static core::smart_refctd_ptr<asset::ICPUImageView> createDerivativeMapViewFromNormalMap(asset::ICPUImage* _inImg);
+
+private:
+       
+	static inline asset::E_FORMAT getRGformat(asset::E_FORMAT f)
+	{
+		const uint32_t bytesPerChannel = (getBytesPerPixel(f) * core::rational(1, getFormatChannelCount(f))).getIntegerApprox();
+
+		switch (bytesPerChannel)
+		{
+			case 1u:
+				return asset::EF_R8G8_SNORM;
+			case 2u:
+				return asset::EF_R16G16_SNORM;
+			case 4u:
+				return asset::EF_R32G32_SFLOAT;
+			case 8u:
+				return asset::EF_R64G64_SFLOAT;
+			default:
+				return asset::EF_UNKNOWN;
+		}
+	};
 };
 
 }

src/nbl/asset/utils/CDerivativeMapCreator.cpp

@@ -124,23 +124,6 @@ core::smart_refctd_ptr<asset::ICPUImage> nbl::asset::CDerivativeMapCreator::crea
 {
 	using namespace asset;
 
-	auto getRGformat = [](asset::E_FORMAT f) -> asset::E_FORMAT {
-		const uint32_t bytesPerChannel = (getBytesPerPixel(f) * core::rational(1, getFormatChannelCount(f))).getIntegerApprox();
-		switch (bytesPerChannel)
-		{
-		case 1u:
-			return asset::EF_R8G8_SNORM;
-		case 2u:
-			return asset::EF_R16G16_SNORM;
-		case 4u:
-			return asset::EF_R32G32_SFLOAT;
-		case 8u:
-			return asset::EF_R64G64_SFLOAT;
-		default:
-			return asset::EF_UNKNOWN;
-		}
-	};
-
 	using ReconstructionKernel = CGaussianImageFilterKernel<>; // or Mitchell
 	using DerivKernel_ = CDerivativeImageFilterKernel<ReconstructionKernel>;
 	using DerivKernel = MyKernel<DerivKernel_>;
@@ -262,7 +245,11 @@ core::smart_refctd_ptr<asset::ICPUImage> nbl::asset::CDerivativeMapCreator::crea
 	newDerivativeNormalMapImage = ICPUImage::create(std::move(newImageParams));
 	newDerivativeNormalMapImage->setBufferAndRegions(std::move(newCpuBuffer), core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<IImage::SBufferCopy>>(1ull, region));
 
+<<<<<<< HEAD
 	using DerivativeNormalMapFilter = CNormalMapToDerivativeFilter<asset::DefaultSwizzle, asset::IdentityDither>;
+=======
+	using DerivativeNormalMapFilter = CNormalMapToDerivativeFilter<asset::DefaultSwizzle>;
+>>>>>>> 8a7153aa... use pitch, move derivative map creation to utilities
 	DerivativeNormalMapFilter derivativeNormalFilter;
 	DerivativeNormalMapFilter::state_type state;