make sure Nabla compiles after merge, but 01 and 06 doesn't

Author: AnastaZIuk

CMakeLists.txt

@@ -15,8 +15,8 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
 
-option(NBL_STATIC_BUILD OFF) # ON for static builds, OFF for shared
-option(NBL_DYNAMIC_MSVC_RUNTIME ON)
+option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
+option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)
 
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")

include/nbl/video/IDeviceMemoryAllocation.h

@@ -20,7 +20,7 @@ TO COPY BETWEEN MEMORY ALLOCATIONS you need to have them bound to
 one or two IGPUBuffers and execute IVideoDriver::copyBuffer between them.
 We only support persistently mapped buffers with ARB_buffer_storage.
 Please don't ask us to support Buffer Orphaning. */
-class NBL_API IDriverMemoryAllocation : public virtual core::IReferenceCounted
+class NBL_API IDeviceMemoryAllocation : public virtual core::IReferenceCounted
 {
         friend class ILogicalDevice;
 

include/nbl/video/IGPUBuffer.h

@@ -22,7 +22,7 @@ namespace nbl::video
 /** For additional OpenGL DSA state-free operations such as flushing mapped ranges or
 buffer to buffer copies, one needs a command buffer in Vulkan as these operations are
 performed by the GPU and not wholly by the driver, so look for them in IGPUCommandBuffer. */
-class NBL_API IGPUBuffer : public asset::IBuffer, public IDriverMemoryBacked, public IBackendObject
+class NBL_API IGPUBuffer : public asset::IBuffer, public IDeviceMemoryBacked, public IBackendObject
 {
 	public:
 		struct SCachedCreationParams

include/nbl/video/IGPUImage.h

@@ -18,7 +18,7 @@
 namespace nbl::video
 {
 
-class NBL_API IGPUImage : public core::impl::ResolveAlignment<IDriverMemoryBacked,asset::IImage>, public IBackendObject
+class NBL_API IGPUImage : public core::impl::ResolveAlignment<IDeviceMemoryBacked,asset::IImage>, public IBackendObject
 {
 	private:
 		using base_t = core::impl::ResolveAlignment<IDeviceMemoryBacked, asset::IImage>;

include/nbl/video/alloc/StreamingTransientDataBuffer.h

@@ -15,23 +15,14 @@
 namespace nbl::video
 {
 
-<<<<<<< HEAD
-template<typename _size_type=uint32_t, class CPUAllocator=core::allocator<uint8_t>, class CustomDeferredFreeFunctor=void, class RecursiveLockable=std::recursive_mutex>
-class NBL_API StreamingTransientDataBufferMT;
 
-namespace impl
-{
-template<typename _size_type=uint32_t, class CPUAllocator=core::allocator<uint8_t>, class CustomDeferredFreeFunctor=void>
-class NBL_API StreamingTransientDataBuffer
-=======
 template<class HostAllocator=core::allocator<uint8_t>, class RecursiveLockable=std::recursive_mutex>
 class StreamingTransientDataBufferMT;
 
 namespace impl
 {
 template<class HostAllocator>
 class StreamingTransientDataBuffer
->>>>>>> c4f7993ce2a3e806c5cbaa5dd539ca53d22f0ec5
 {
         using ThisType = StreamingTransientDataBuffer<HostAllocator>;
         using Composed = impl::CAsyncSingleBufferSubAllocator<core::GeneralpurposeAddressAllocator<uint32_t>,HostAllocator>;
@@ -113,13 +104,8 @@ class StreamingTransientDataBuffer
 };
 }
 
-<<<<<<< HEAD
-template<typename _size_type=uint32_t, class CPUAllocator=core::allocator<uint8_t>, class CustomDeferredFreeFunctor=void>
-class NBL_API StreamingTransientDataBufferST : public core::IReferenceCounted, public impl::StreamingTransientDataBuffer<_size_type,CPUAllocator,CustomDeferredFreeFunctor>
-=======
 template<class HostAllocator=core::allocator<uint8_t>>
 class StreamingTransientDataBufferST : public core::IReferenceCounted, public impl::StreamingTransientDataBuffer<HostAllocator>
->>>>>>> c4f7993ce2a3e806c5cbaa5dd539ca53d22f0ec5
 {
         using Base = impl::StreamingTransientDataBuffer<HostAllocator>;
 
@@ -131,13 +117,8 @@ class StreamingTransientDataBufferST : public core::IReferenceCounted, public im
         StreamingTransientDataBufferST(Args&&... args) : Base(std::forward<Args>(args)...) {}
 };
 
-<<<<<<< HEAD
-template<typename _size_type, class CPUAllocator, class CustomDeferredFreeFunctor, class RecursiveLockable>
-class NBL_API StreamingTransientDataBufferMT : public core::IReferenceCounted
-=======
 template<class HostAllocator, class RecursiveLockable>
 class StreamingTransientDataBufferMT : public core::IReferenceCounted
->>>>>>> c4f7993ce2a3e806c5cbaa5dd539ca53d22f0ec5
 {
         using Composed = impl::StreamingTransientDataBuffer<HostAllocator>;