Fix clang compile errors to make Nabla compile on android build - there is one TODO to take care of!

Author: AnastaZIuk

include/nbl/asset/IBuffer.h

@@ -62,14 +62,20 @@ struct NBL_API SBufferBinding
 template<typename BufferType>
 struct NBL_API SBufferRange
 {
+	SBufferRange(const size_t& _offset, const size_t _size, core::smart_refctd_ptr<BufferType>&& _buffer)
+		: offset(_offset), size(_size), buffer(core::smart_refctd_ptr<BufferType>(_buffer)) {}
+
+	SBufferRange() : offset(0ull), size(0ull), buffer(nullptr) {}
+
 	inline bool isValid() const
 	{
 		return buffer && size && (offset+size<=buffer->getSize());
 	}
 
-	size_t offset = 0ull;
-	size_t size = 0ull;
-	core::smart_refctd_ptr<BufferType> buffer = nullptr;
+	size_t offset;
+	size_t size ;
+	core::smart_refctd_ptr<BufferType> buffer;
+
 	inline bool operator==(const SBufferRange<BufferType>& rhs) const { return buffer==rhs.buffer && offset==rhs.offset && size==rhs.size; }
 	inline bool operator!=(const SBufferRange<BufferType>& rhs) const { return !operator==(rhs); }
 };

include/nbl/asset/ICPUAnimationLibrary.h

@@ -99,7 +99,7 @@ class NBL_API ICPUAnimationLibrary final : public IAnimationLibrary<ICPUBuffer>,
 			SBufferBinding<ICPUBuffer> _keyframeStorageBinding = {m_keyframeStorageBinding.offset,_depth>0u ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_keyframeStorageBinding.buffer->clone(_depth-1u)):m_keyframeStorageBinding.buffer};
 			SBufferBinding<ICPUBuffer> _timestampStorageBinding = {m_timestampStorageBinding.offset,_depth>0u ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_timestampStorageBinding.buffer->clone(_depth-1u)):m_timestampStorageBinding.buffer};
 
-			SBufferRange<ICPUBuffer> _animationStorageRange = {m_animationStorageRange.offset,m_animationStorageRange.size,_depth>0u&&m_animationStorageRange.buffer ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_animationStorageRange.buffer->clone(_depth-1u)):m_animationStorageRange.buffer};
+			SBufferRange<ICPUBuffer> _animationStorageRange = {m_animationStorageRange.offset,m_animationStorageRange.size,_depth>0u&&m_animationStorageRange.buffer ? core::smart_refctd_ptr_static_cast<ICPUBuffer>(m_animationStorageRange.buffer->clone(_depth-1u)):core::smart_refctd_ptr(m_animationStorageRange.buffer)};
 
  			auto cp = core::make_smart_refctd_ptr<ICPUAnimationLibrary>(std::move(_keyframeStorageBinding),std::move(_timestampStorageBinding),m_keyframeCount,std::move(_animationStorageRange));
 			clone_common(cp.get());

include/nbl/ui/CWindowAndroid.h

@@ -27,6 +27,15 @@ class CWindowAndroid : public IWindowAndroid
 		inline const native_handle_t& getNativeHandle() const override { return m_native; }
 
 		inline void setCaption(const std::string_view& caption) override {}
+		virtual IWindowManager* getManager() override 
+		{
+			/*
+				TODO: this class should have m_windowManager member...
+			*/ 
+
+			assert(false);
+			return nullptr;  
+		}
 
 		// WHY THE FUCK ARE THESE PUBLIC?
 		core::map<uint32_t, core::smart_refctd_ptr<IMouseEventChannel>> m_mouseEventChannels;

include/nbl/video/alloc/CAsyncSingleBufferSubAllocator.h

@@ -35,8 +35,8 @@ class CAsyncSingleBufferSubAllocator
         class DeferredFreeFunctor
         {
                 static constexpr size_t PseudoTupleByteSize = (2u*sizeof(size_type)+sizeof(core::smart_refctd_ptr<core::IReferenceCounted>));
-                static constexpr size_t AllocatorUnitsPerMetadata = PseudoTupleByteSize/sizeof(HostAllocator::value_type);
-                static_assert((PseudoTupleByteSize%sizeof(HostAllocator::value_type)) == 0u, "should be divisible by HostAllocator::value_type");
+                static constexpr size_t AllocatorUnitsPerMetadata = PseudoTupleByteSize/sizeof(typename HostAllocator::value_type);
+                static_assert((PseudoTupleByteSize%sizeof(typename HostAllocator::value_type)) == 0u, "should be divisible by HostAllocator::value_type");
 
             public:
                 template<typename T>

include/nbl/video/utilities/IUtilities.h

@@ -125,7 +125,7 @@ class NBL_API IUtilities : public core::IReferenceCounted
             auto mreqs = buffer->getMemoryReqs();
             mreqs.memoryTypeBits &= m_device->getPhysicalDevice()->getDeviceLocalMemoryTypeBits();
             auto mem = m_device->allocate(mreqs, buffer.get());
-            updateBufferRangeViaStagingBuffer(queue, asset::SBufferRange<IGPUBuffer>{0u, params.size, buffer}, data);
+            updateBufferRangeViaStagingBuffer(queue, asset::SBufferRange<IGPUBuffer>{0u, params.size, core::smart_refctd_ptr(buffer)}, data);
             return buffer;
         }
 

src/nbl/asset/interchange/CGLTFLoader.cpp

@@ -619,10 +619,13 @@ using namespace nbl::asset;
 						}
 					}
 
-					//
 					skins[index].skeleton = skeletons[skeletonNodes[globalRootNode].skeletonID];
-					skins[index].translationTable = {sizeof(ICPUSkeleton::joint_id_t)*skinJointRefCount,sizeof(ICPUSkeleton::joint_id_t)*jointCount,vertexJointToSkeletonJoint};
-					skins[index].inverseBindPose = {sizeof(core::matrix3x4SIMD)*skinJointRefCount,sizeof(core::matrix3x4SIMD)*jointCount,inverseBindPose};
+					skins[index].translationTable.offset = sizeof(ICPUSkeleton::joint_id_t) * skinJointRefCount;
+					skins[index].translationTable.size = sizeof(ICPUSkeleton::joint_id_t) * jointCount;
+					skins[index].translationTable.buffer = core::smart_refctd_ptr(vertexJointToSkeletonJoint);
+					skins[index].inverseBindPose.offset = sizeof(core::matrix3x4SIMD) * skinJointRefCount;
+					skins[index].inverseBindPose.size = sizeof(core::matrix3x4SIMD) * jointCount;
+					skins[index].inverseBindPose.buffer = core::smart_refctd_ptr(inverseBindPose);
 					skins[index].jointCount = jointCount;
 
 					auto translationTableIt = reinterpret_cast<ICPUSkeleton::joint_id_t*>(skins[index].translationTable.buffer->getPointer())+skinJointRefCount;