Merge branch 'expose_nabla_apis_rebased' into hlsl-compiler-impl

# Conflicts:
#	include/nbl/asset/utils/CHLSLCompiler.h

Author: Erfan-Ahmadi

include/nbl/asset/IAsset.h

@@ -39,7 +39,7 @@ class IAssetManager;
 	@see IReferenceCounted
 */
 
-class NBL_API IAsset : virtual public core::IReferenceCounted
+class NBL_API2 IAsset : virtual public core::IReferenceCounted
 {
 	public:
 		enum E_MUTABILITY : uint32_t

include/nbl/asset/IAssetManager.h

@@ -45,7 +45,7 @@ std::function<void(SAssetBundle&)> makeAssetDisposeFunc(const IAssetManager* con
 	@see IAsset
 
 */
-class NBL_API IAssetManager : public core::IReferenceCounted, public core::QuitSignalling
+class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::QuitSignalling
 {
         // the point of those functions is that lambdas returned by them "inherits" friendship
         friend std::function<void(SAssetBundle&)> makeAssetGreetFunc(const IAssetManager* const _mgr);

include/nbl/asset/ICPUBuffer.h

@@ -33,7 +33,7 @@ class NBL_API ICPUBuffer : public asset::IBuffer, public asset::IAsset
         }
 
         //! Non-allocating constructor for CCustormAllocatorCPUBuffer derivative
-        ICPUBuffer(size_t sizeInBytes, void* dat) : asset::IBuffer({dat ? sizeInBytes:0,EUF_TRANSFER_DST_BIT}), data(dat) {}
+        ICPUBuffer(size_t sizeInBytes, void* dat) : asset::IBuffer({ dat ? sizeInBytes : 0,EUF_TRANSFER_DST_BIT }), data(dat) {}
     public:
         //! Constructor. TODO: remove, alloc can fail, should be a static create method instead!
         /** @param sizeInBytes Size in bytes. If `dat` argument is present, it denotes size of data pointed by `dat`, otherwise - size of data to be allocated.
@@ -56,7 +56,7 @@ class NBL_API ICPUBuffer : public asset::IBuffer, public asset::IAsset
             return cp;
         }
 
-        virtual void convertToDummyObject(uint32_t referenceLevelsBelowToConvert=0u) override
+        virtual void convertToDummyObject(uint32_t referenceLevelsBelowToConvert = 0u) override
         {
             if (!canBeConvertedToDummy())
                 return;
@@ -79,7 +79,7 @@ class NBL_API ICPUBuffer : public asset::IBuffer, public asset::IAsset
         virtual void* getPointer() 
         { 
             assert(!isImmutable_debug());
-            return data; 
+            return data;
         }
 
         bool canBeRestoredFrom(const IAsset* _other) const override
@@ -115,15 +115,15 @@ class NBL_API ICPUBuffer : public asset::IBuffer, public asset::IAsset
             if (willBeRestoredFrom(_other))
                 std::swap(data, other->data);
         }
-        
+
         void* data;
-};
+    };
 
-template<
-    typename Allocator = _NBL_DEFAULT_ALLOCATOR_METATYPE<uint8_t>,
-    bool = std::is_same<Allocator, core::null_allocator<typename Allocator::value_type> >::value
->
-class NBL_API CCustomAllocatorCPUBuffer;
+    template<
+        typename Allocator = _NBL_DEFAULT_ALLOCATOR_METATYPE<uint8_t>,
+        bool = std::is_same<Allocator, core::null_allocator<typename Allocator::value_type> >::value
+    >
+        class NBL_API CCustomAllocatorCPUBuffer;
 
 using CDummyCPUBuffer = CCustomAllocatorCPUBuffer<core::null_allocator<uint8_t>, true>;
 
@@ -133,11 +133,11 @@ using CDummyCPUBuffer = CCustomAllocatorCPUBuffer<core::null_allocator<uint8_t>,
     passing an object type for allocation and a pointer to allocated
     data for it's storage by ICPUBuffer.
 
-    So the need for the class existence is for common following tricks - among others creating an 
-    \bICPUBuffer\b over an already existing \bvoid*\b array without any \imemcpy\i or \itaking over the memory ownership\i.
-    You can use it with a \bnull_allocator\b that adopts memory (it is a bit counter intuitive because \badopt = take\b ownership, 
-    but a \inull allocator\i doesn't do anything, even free the memory, so you're all good).
-*/
+        So the need for the class existence is for common following tricks - among others creating an
+        \bICPUBuffer\b over an already existing \bvoid*\b array without any \imemcpy\i or \itaking over the memory ownership\i.
+        You can use it with a \bnull_allocator\b that adopts memory (it is a bit counter intuitive because \badopt = take\b ownership,
+        but a \inull allocator\i doesn't do anything, even free the memory, so you're all good).
+    */
 
 template<typename Allocator>
 class NBL_API CCustomAllocatorCPUBuffer<Allocator, true> : public ICPUBuffer

include/nbl/asset/filters/CBasicImageFilterCommon.h

@@ -332,7 +332,7 @@ class NBL_API CBasicImageFilterCommon
 		}
 
 	protected:
-		virtual ~CBasicImageFilterCommon() =0;
+		virtual NBL_API2 ~CBasicImageFilterCommon() =0;
 
 		static inline bool validateSubresourceAndRange(	const ICPUImage::SSubresourceLayers& subresource,
 														const IImageFilter::IState::TexelRange& range,

include/nbl/asset/interchange/IAssetLoader.h

@@ -58,7 +58,7 @@ class IMeshManipulator;
 	@see IAssetWriter
 */
 
-class NBL_API IAssetLoader : public virtual core::IReferenceCounted
+class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 {
 public:
     enum E_CACHING_FLAGS : uint64_t
@@ -171,15 +171,15 @@ class NBL_API IAssetLoader : public virtual core::IReferenceCounted
     }
 
     //! Override class to facilitate changing how assets are loaded
-    class IAssetLoaderOverride
+	class IAssetLoaderOverride
     {
     protected:
 		_NBL_STATIC_INLINE_CONSTEXPR IAsset::E_MUTABILITY ASSET_MUTABILITY_ON_CACHE_INSERT = IAsset::EM_MUTABLE;
 
         IAssetManager* m_manager;
 		system::ISystem* m_system;
     public:
-		IAssetLoaderOverride(IAssetManager* _manager);
+		NBL_API2 IAssetLoaderOverride(IAssetManager* _manager);
 
 		//!
 		template<class AssetT>

include/nbl/asset/utils/CHLSLCompiler.h

@@ -9,13 +9,11 @@
 #include "nbl/asset/utils/IShaderCompiler.h"
 
 #include <wrl.h>
+#include <combaseapi.h>
+#include <dxc/dxc/include/dxc/dxcapi.h>
 
 using Microsoft::WRL::ComPtr;
 
-class IDxcUtils;
-class IDxcCompiler3;
-class DxcCompilationResult;
-
 namespace nbl::asset
 {
 

include/nbl/video/CVulkanSwapchain.h

@@ -22,7 +22,7 @@ class CVulkanSwapchain final : public ISwapchain
         m_vkSwapchainKHR(swapchain), m_imgMemRequirements(std::move(imgMemRequirements))
     {}
 
-    static core::smart_refctd_ptr<CVulkanSwapchain> create(const core::smart_refctd_ptr<ILogicalDevice>&& logicalDevice, ISwapchain::SCreationParams&& params);
+    NBL_API2 static core::smart_refctd_ptr<CVulkanSwapchain> create(const core::smart_refctd_ptr<ILogicalDevice>&& logicalDevice, ISwapchain::SCreationParams&& params);
 
     ~CVulkanSwapchain();
 

include/nbl/video/IDeviceMemoryBacked.h

@@ -10,7 +10,7 @@
 namespace nbl::video
 {
 //! If you bound an "exotic" memory object to the resource, you might require "special" cleanups in the destructor
-struct ICleanup
+struct NBL_API2 ICleanup
 {
     virtual ~ICleanup() = 0;
 };

include/nbl/video/IGPUFence.h

@@ -39,7 +39,7 @@ class NBL_API IGPUFence : public core::IReferenceCounted, public IBackendObject
 };
 
 
-class NBL_API GPUEventWrapper : public core::Uncopyable
+class NBL_API2 GPUEventWrapper : public core::Uncopyable
 {
 protected:
     ILogicalDevice* mDevice;

include/nbl/video/ILogicalDevice.h

@@ -37,7 +37,7 @@ namespace nbl::video
 class IDescriptorPool;
 class IPhysicalDevice;
 
-class NBL_API ILogicalDevice : public core::IReferenceCounted, public IDeviceMemoryAllocator
+class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMemoryAllocator
 {
     public:
         struct SQueueCreationParams