resolve conflicts and merge

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -21,7 +21,11 @@ add_subdirectory(openssl openssl EXCLUDE_FROM_ALL)
 
 # DXC
 set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
+if(WIN32)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
+elseif(UNIX)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
+endif()
 option(_NBL_ENABLE_DXC_COMPILE_TESTS_ "Enable it in order to test compilation of Nabla shaders at build time" OFF)
 option(_NBL_DXC_COMPILE_TESTS_ENABLE_CMAKE_LOG_ "Enable more verbose log when creating DXC compile test target - only for Nabla developers!" OFF)
 set(_NBL_DXC_CT_PREFIX_CMAKE_LOG_DEBUG_ "[DXC_CT]:" CACHE INTERNAL "only for Nabla developers")
@@ -47,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 endif()
 
 
-# TODO: redo
-find_package(Wayland)  # TODO: remove, load Wayland dynamically
-
-
 # zlib (target is zlibstatic)
 set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_SKIP_INSTALL_ALL ${SKIP_INSTALL_ALL})

3rdparty/dxc/CMakeLists.txt

@@ -60,10 +60,24 @@ else()
 endif()
 
 set(DXC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CACHE INTERNAL "")
-execute_process(COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
-	RESULT_VARIABLE DXC_CMAKE_RESULT
-	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
-)
+
+if(WIN32)
+	execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
+		RESULT_VARIABLE DXC_CMAKE_RESULT
+		OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+	)
+else()
+	execute_process(COMMAND "${CMAKE_COMMAND}" 
+		-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
+		-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
+		-G "${CMAKE_GENERATOR}" 
+		-T "${CMAKE_GENERATOR_TOOLSET}"
+		-B "${DXC_BUILD_DIR}" 
+		-D "CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
+		RESULT_VARIABLE DXC_CMAKE_RESULT
+		OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+	)
+endif()
 
 if(NOT "${DXC_CMAKE_RESULT}" STREQUAL "0")
 	message(FATAL_ERROR "${DXC_CMAKE_STREAM_PIPE}")

3rdparty/dxc/test/test.cpp

@@ -1,6 +1,10 @@
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang supported
+if(NBL_BUILD_DPL AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang ifsupported
 	get_filename_component(CCBD_ABSOLUTE "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE)
 
+	if (NBL_BUILD_DPL)
+		set(_NBL_BUILD_DPL_ ${NBL_BUILD_DPL})
+	endif()
+
 	set(TBB_INSTALL_VARS ON CACHE BOOL "" FORCE)
 	set(TBB_TEST OFF CACHE BOOL "" FORCE)
 	set(TBB_STRICT ON CACHE BOOL "" FORCE)
@@ -45,7 +49,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang
 		SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/oneDPL
 		BINARY_DIR ${ONEDPL_BUILD}
 		CMAKE_ARGS ${CMAKE_ARGS_ONEDPL}
-		BUILD_COMMAND cmake --build ${ONEDPL_BUILD} --target build-all
+		BUILD_COMMAND cmake --build ${ONEDPL_BUILD}
 		INSTALL_COMMAND cmake --install ${ONEDPL_BUILD} --prefix ${ONEDPL_INSTALL_DIR}
 		USES_TERMINAL_BUILD 1
 		COMMENT "Building oneDPL..."

3rdparty/pstl/CMakeLists.txt

@@ -12,6 +12,7 @@ include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
+enable_language(C CXX ASM)
 
 option(NBL_STATIC_BUILD "" ON) # ON for static builds, OFF for shared
 option(NBL_DYNAMIC_MSVC_RUNTIME "" OFF)
@@ -261,6 +262,8 @@ endif()
 #uncomment in the future
 #option(NBL_TARGET_ARCH_ARM "Build for ARM?" OFF)
 
+option(NBL_BUILD_DPL "Enable DPL (Dynamic Parallelism Library)" OFF)
+
 option(NBL_PCH "Enable pre-compiled header" ON)
 
 option(NBL_FAST_MATH "Enable fast low-precision math" ON)

3rdparty/tcpp

@@ -330,14 +330,12 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::Quit
                 filePath = _params.workingDirectory/filePath;
                 _override->getLoadFilename(filePath, m_system.get(), ctx, _hierarchyLevel);
             }
-
+            
             system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
             m_system->createFile(future, filePath, system::IFile::ECF_READ);
-            auto file = future.get();
-            if (!file)
-                return SAssetBundle(0);
-
-            return getAssetInHierarchy_impl<RestoreWholeBundle>(file.get(), filePath.string(), ctx.params, _hierarchyLevel, _override);
+            if (auto file=future.acquire())
+                return getAssetInHierarchy_impl<RestoreWholeBundle>(file->get(), filePath.string(), ctx.params, _hierarchyLevel, _override);
+            return SAssetBundle(0);
         }
 
         //TODO change name
@@ -652,15 +650,10 @@ class NBL_API2 IAssetManager : public core::IReferenceCounted, public core::Quit
                 _override = &defOverride;
 
             system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
-            m_system->createFile(future, (_params.workingDirectory.generic_string() + _filename).c_str(), system::IFile::ECF_WRITE);
-            auto file = future.get();
-			if (file) // could fail creating file (lack of permissions)
-			{
-				bool res = writeAsset(file.get(), _params, _override);
-				return res;
-			}
-			else
-				return false;
+            m_system->createFile(future, (_params.workingDirectory.generic_string()+_filename).c_str(), system::IFile::ECF_WRITE);
+            if (auto file=future.acquire())
+                return writeAsset(file->get(), _params, _override);
+            return false;
         }
         bool writeAsset(system::IFile* _file, const IAssetWriter::SAssetWriteParams& _params, IAssetWriter::IAssetWriterOverride* _override)
         {

CMakeLists.txt

@@ -70,7 +70,7 @@ class ICPUBuffer : public asset::IBuffer, public asset::IAsset
         }
 
         _NBL_STATIC_INLINE_CONSTEXPR auto AssetType = ET_BUFFER;
-        inline E_TYPE getAssetType() const override { return AssetType; }
+        inline IAsset::E_TYPE getAssetType() const override { return AssetType; }
 
         virtual size_t conservativeSizeEstimate() const override { return getSize(); }
 
@@ -117,13 +117,13 @@ class ICPUBuffer : public asset::IBuffer, public asset::IAsset
         }
 
         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 CCustomAllocatorCPUBuffer;
+template<
+    typename Allocator = _NBL_DEFAULT_ALLOCATOR_METATYPE<uint8_t>,
+    bool = std::is_same<Allocator, core::null_allocator<typename Allocator::value_type> >::value
+>
+class CCustomAllocatorCPUBuffer;
 
 using CDummyCPUBuffer = CCustomAllocatorCPUBuffer<core::null_allocator<uint8_t>, true>;
 

examples_tests

@@ -44,7 +44,7 @@ class ICPUBufferView : public IBufferView<ICPUBuffer>, public IAsset
 		}
 
 		_NBL_STATIC_INLINE_CONSTEXPR auto AssetType = ET_BUFFER_VIEW;
-		inline E_TYPE getAssetType() const override { return AssetType; }
+		inline IAsset::E_TYPE getAssetType() const override { return AssetType; }
 
 		ICPUBuffer* getUnderlyingBuffer() 
 		{