piles of workaround to get linux build to work wiht clang-15

pollend · pollend · commit 0c8fc69a6576 · 2023-02-21T21:14:25.000-08:00
Signed-off-by: Michael Pollind &lt;mpollind@gmail.com&gt;
diff --git a/3rdparty/CMakeLists.txt b/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")
@@ -48,7 +52,7 @@ endif()
 
 
 # TODO: redo
-find_package(Wayland)  # TODO: remove, load Wayland dynamically
+# find_package(Wayland)  # TODO: remove, load Wayland dynamically
 
 
 # zlib (target is zlibstatic)
diff --git a/3rdparty/dxc/CMakeLists.txt b/3rdparty/dxc/CMakeLists.txt
@@ -1,5 +1,5 @@
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_OPTIONAL_PROJS_IN_DEFAULT:BOOL=OFF")
-list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_ANALYZE:BOOL=OFF")
+# list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_ANALYZE:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_OFFICIAL_BUILD:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_ENABLE_FIXED_VER:BOOL=OFF")
 list(APPEND NBL_DXC_CMAKE_OPTIONS "-DHLSL_FIXED_VERSION_LOCATION:STRING=")
@@ -60,11 +60,29 @@ 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}
+# 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}"-D CMAKE_BUILD_TYPE:STRING=Debug   ${NBL_DXC_CMAKE_OPTIONS}
+# 	RESULT_VARIABLE DXC_CMAKE_RESULT
+# 	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
+# )
+
+execute_process(COMMAND "${CMAKE_COMMAND}" 
+	-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
+	-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
+	-D "CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE" 
+	-D "CMAKE_BUILD_TYPE:STRING=Debug" 
+	-D "CMAKE_C_COMPILER:FILEPATH=/usr/bin/gcc" 
+	-D "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/g++"
+	-B "${DXC_BUILD_DIR}" 
+	-G "Ninja"
 	RESULT_VARIABLE DXC_CMAKE_RESULT
 	OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
 )
 
+# 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
+# )
+
 if(NOT "${DXC_CMAKE_RESULT}" STREQUAL "0")
 	message(FATAL_ERROR "${DXC_CMAKE_STREAM_PIPE}")
 endif()
@@ -108,8 +126,8 @@ if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
 	add_subdirectory(CT CT)
 endif()
 
-include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
-include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
+# include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/debug.cmake")
+# include("${DXC_BUILD_DIR}/nbl/generate/dxc/config/release.cmake")
 
 set(DXC_INCLUDE_DIRECTORIES
 	$<IF:$<CONFIG:Debug>,${NBL_DXC_DEBUG_INCLUDE_DIRECTORIES},${NBL_DXC_RELEASE_INCLUDE_DIRECTORIES}>
diff --git a/3rdparty/dxc/test/test.cpp b/3rdparty/dxc/test/test.cpp
diff --git a/3rdparty/pstl/CMakeLists.txt b/3rdparty/pstl/CMakeLists.txt
@@ -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..."
diff --git a/CMakeLists.txt b/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)
@@ -260,6 +261,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)
diff --git a/include/nbl/asset/utils/CCompilerSet.h b/include/nbl/asset/utils/CCompilerSet.h
@@ -15,8 +15,11 @@ namespace nbl::asset
 	{
 	public:
 		CCompilerSet(core::smart_refctd_ptr<system::ISystem>&& sys)
-			: m_HLSLCompiler(core::make_smart_refctd_ptr<CHLSLCompiler>(core::smart_refctd_ptr(sys)))
-			, m_GLSLCompiler(core::make_smart_refctd_ptr<CGLSLCompiler>(core::smart_refctd_ptr(sys)))
+			: 
+#ifdef _NBL_PLATFORM_WINDOWS_
+			m_HLSLCompiler(core::make_smart_refctd_ptr<CHLSLCompiler>(core::smart_refctd_ptr(sys))),
+#endif
+			m_GLSLCompiler(core::make_smart_refctd_ptr<CGLSLCompiler>(core::smart_refctd_ptr(sys)))
 		{}
 
 		core::smart_refctd_ptr<ICPUShader> compileToSPIRV(const asset::ICPUShader* shader, const IShaderCompiler::SCompilerOptions& options) const;
@@ -25,16 +28,24 @@ namespace nbl::asset
 
 		inline core::smart_refctd_ptr<IShaderCompiler> getShaderCompiler(IShader::E_CONTENT_TYPE contentType) const
 		{
-			if (contentType == IShader::E_CONTENT_TYPE::ECT_HLSL)
+
+			if (contentType == IShader::E_CONTENT_TYPE::ECT_HLSL) {
+				
+#ifdef _NBL_PLATFORM_WINDOWS_
 				return m_HLSLCompiler;
+#endif
+			}
 			else if (contentType == IShader::E_CONTENT_TYPE::ECT_GLSL)
 				return m_GLSLCompiler;
 			else
 				return nullptr;
 		}
 
 	protected:
+
+#ifdef _NBL_PLATFORM_WINDOWS_
 		core::smart_refctd_ptr<CHLSLCompiler> m_HLSLCompiler = nullptr;
+#endif
 		core::smart_refctd_ptr<CGLSLCompiler> m_GLSLCompiler = nullptr;
 	};
 }
diff --git a/include/nbl/asset/utils/CHLSLCompiler.h b/include/nbl/asset/utils/CHLSLCompiler.h
@@ -8,6 +8,8 @@
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
 #include "nbl/asset/utils/IShaderCompiler.h"
 
+#ifdef _NBL_PLATFORM_WINDOWS_
+
 namespace nbl::asset::hlsl::impl
 {
 	class DXC;
@@ -66,4 +68,6 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
 
 }
 
+#endif
+
 #endif
diff --git a/include/nbl/config/BuildConfigOptions.h.in b/include/nbl/config/BuildConfigOptions.h.in
@@ -63,6 +63,8 @@
 #cmakedefine __NBL_FAST_MATH
 #cmakedefine _NBL_EMBED_BUILTIN_RESOURCES_
 
+#cmakedefine _NBL_BUILD_DPL_
+
 // TODO: This has to disapppear from the main header and go to the OptiX extension header + config
 #cmakedefine OPTIX_INCLUDE_DIR "@OPTIX_INCLUDE_DIR@"
 
diff --git a/include/nbl/core/execution.h b/include/nbl/core/execution.h
@@ -5,7 +5,7 @@
 #ifndef _NBL_CORE_EXECUTION_H_INCLUDED_
 #define _NBL_CORE_EXECUTION_H_INCLUDED_
 
-#if !defined (__clang__)
+#ifndef _NBL_BUILD_DPL_
 #include <execution>
 #include <algorithm>
 #else
@@ -26,7 +26,7 @@ inline auto highLevelF(Args&&... args) -> decltype(lowLevelF(std::forward<Args>(
 
 namespace nbl::core
 {
-#if !defined (__clang__)
+#ifndef _NBL_BUILD_DPL_
 namespace execution = std::execution;
 
 ALIAS_TEMPLATE_FUNCTION(for_each_n, std::for_each_n)
diff --git a/include/nbl/core/string/StringLiteral.h b/include/nbl/core/string/StringLiteral.h
@@ -4,6 +4,8 @@
 #ifndef _NBL_CORE_STRING_LITERAL_H_INCLUDED_
 #define _NBL_CORE_STRING_LITERAL_H_INCLUDED_
 
+#include <algorithm>
+
 namespace nbl::core
 {
 
diff --git a/include/nbl/ui/declarations.h b/include/nbl/ui/declarations.h
@@ -14,7 +14,6 @@
 #elif defined(_NBL_BUILD_WITH_WAYLAND) && defined(_NBL_TEST_WAYLAND)
 #	include "nbl/ui/CWindowManagerWayland.h"
 #elif defined(_NBL_PLATFORM_LINUX_)
-#	include "nbl/ui/CWindowManagerX11.h"
 #endif // TODO more platforms (android)
 
 // clipboards
diff --git a/include/nbl/video/IPhysicalDevice.h b/include/nbl/video/IPhysicalDevice.h
@@ -609,8 +609,8 @@ class NBL_API2 IPhysicalDevice : public core::Interface, public core::Unmovable
         using SBufferFormatPromotionRequest = FormatPromotionRequest<IPhysicalDevice::SFormatBufferUsages::SUsage>;
         using SImageFormatPromotionRequest = FormatPromotionRequest<IPhysicalDevice::SFormatImageUsages::SUsage>;
 
-        asset::E_FORMAT promoteBufferFormat(const SBufferFormatPromotionRequest req);
-        asset::E_FORMAT promoteImageFormat(const SImageFormatPromotionRequest req, const IGPUImage::E_TILING tiling);
+        // asset::E_FORMAT promoteBufferFormat(const SBufferFormatPromotionRequest req);
+        // asset::E_FORMAT promoteImageFormat(const SImageFormatPromotionRequest req, const IGPUImage::E_TILING tiling);
 
         //
         inline system::ISystem* getSystem() const {return m_system.get();}
diff --git a/include/nbl/video/utilities/IGPUObjectFromAssetConverter.h b/include/nbl/video/utilities/IGPUObjectFromAssetConverter.h
@@ -1043,14 +1043,14 @@ auto IGPUObjectFromAssetConverter::create(const asset::ICPUImage** const _begin,
         }
         
         promotionRequest.usages = promotionRequest.usages | params.usage;
-        auto newFormat = _params.utilities->getLogicalDevice()->getPhysicalDevice()->promoteImageFormat(promotionRequest, video::IGPUImage::ET_OPTIMAL);
+        // auto newFormat = _params.utilities->getLogicalDevice()->getPhysicalDevice()->promoteImageFormat(promotionRequest, video::IGPUImage::ET_OPTIMAL);
         
         // If Format Promotion failed try the same usages but with linear tiling.
-        if (params.format == asset::EF_UNKNOWN)
-            newFormat = _params.utilities->getLogicalDevice()->getPhysicalDevice()->promoteImageFormat(promotionRequest, video::IGPUImage::ET_LINEAR);
+        // if (params.format == asset::EF_UNKNOWN)
+            // newFormat = _params.utilities->getLogicalDevice()->getPhysicalDevice()->promoteImageFormat(promotionRequest, video::IGPUImage::ET_LINEAR);
 
         assert(params.format != asset::EF_UNKNOWN); // No feasible supported format found for creating this image
-        params.format = newFormat;
+        // params.format = newFormat;
 
         auto gpuimg = _params.device->createImage(std::move(params));
         auto gpuimgMemReqs = gpuimg->getMemoryReqs();
diff --git a/src/nbl/CMakeLists.txt b/src/nbl/CMakeLists.txt
@@ -417,7 +417,7 @@ target_include_directories(Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/parallel-hashm
 # TCPP
 target_include_directories(Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/tcpp)
 # oneDPL for clang C++17 parallelism
-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+if(_NBL_BUILD_DPL_)
 	add_dependencies(Nabla oneDPL)
 	target_include_directories(Nabla PUBLIC ${ONETBB_INSTALL_DIR}/include)
 	target_include_directories(Nabla PUBLIC ${ONEDPL_INSTALL_DIR}/include)
@@ -687,7 +687,7 @@ if(NBL_STATIC_BUILD)
 	nbl_install_lib(zlibstatic)
 	nbl_install_lib(simdjson)
 	nbl_install_lib(volk)
-	if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if(_NBL_BUILD_DPL_)
 		nbl_install_program(tbb)
 		nbl_install_program(tbbmalloc)
 		nbl_install_program(tbbmalloc_proxy)
diff --git a/src/nbl/asset/IAssetManager.cpp b/src/nbl/asset/IAssetManager.cpp
@@ -8,6 +8,9 @@
 #include "nbl/asset/interchange/CHLSLLoader.h"
 #include "nbl/asset/interchange/CSPVLoader.h"
 
+#include <array>
+#include <nbl/core/string/StringLiteral.h>	
+
 #ifdef _NBL_COMPILE_WITH_MTL_LOADER_
 #include "nbl/asset/interchange/CGraphicsPipelineLoaderMTL.h"
 #endif
diff --git a/src/nbl/asset/utils/CCompilerSet.cpp b/src/nbl/asset/utils/CCompilerSet.cpp
@@ -15,8 +15,11 @@ core::smart_refctd_ptr<ICPUShader> CCompilerSet::compileToSPIRV(const ICPUShader
 		{
 		case IShader::E_CONTENT_TYPE::ECT_HLSL:
 		{
+
+#ifdef _NBL_PLATFORM_WINDOWS_
 			const char* code = reinterpret_cast<const char*>(shader->getContent()->getPointer());
 			outSpirvShader = m_HLSLCompiler->compileToSPIRV(code, options);
+#endif
 		}
 		break;
 		case IShader::E_CONTENT_TYPE::ECT_GLSL:
@@ -43,10 +46,12 @@ core::smart_refctd_ptr<ICPUShader> CCompilerSet::preprocessShader(const ICPUShad
 		{
 		case IShader::E_CONTENT_TYPE::ECT_HLSL:
 		{
+#ifdef _NBL_PLATFORM_WINDOWS_
 			const char* code = reinterpret_cast<const char*>(shader->getContent()->getPointer());
 			auto stage = shader->getStage();
 			auto resolvedCode = m_HLSLCompiler->preprocessShader(code, stage, preprocessOptions);
 			return core::make_smart_refctd_ptr<ICPUShader>(resolvedCode.c_str(), stage, IShader::E_CONTENT_TYPE::ECT_HLSL, std::string(shader->getFilepathHint()));
+#endif
 		}
 		break;
 		case IShader::E_CONTENT_TYPE::ECT_GLSL:
@@ -61,6 +66,5 @@ core::smart_refctd_ptr<ICPUShader> CCompilerSet::preprocessShader(const ICPUShad
 			return nullptr;
 		}
 	}
-	else
-		return nullptr;
+	return nullptr;
 }
diff --git a/src/nbl/asset/utils/CHLSLCompiler.cpp b/src/nbl/asset/utils/CHLSLCompiler.cpp
@@ -4,6 +4,9 @@
 #include "nbl/asset/utils/CHLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
 
+
+#ifdef _NBL_PLATFORM_WINDOWS_
+
 #include <wrl.h>
 #include <combaseapi.h>
 
@@ -330,3 +333,5 @@ void CHLSLCompiler::insertIntoStart(std::string& code, std::ostringstream&& ins)
 {
     code.insert(0u, ins.str());
 }
+
+#endif
diff --git a/src/nbl/video/IPhysicalDevice.cpp b/src/nbl/video/IPhysicalDevice.cpp

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`#include "nbl/asset/utils/ISPIRVOptimizer.h"`
`9`	`9`	`#include "nbl/asset/utils/IShaderCompiler.h"`
`10`	`10`
	`11`	`+#ifdef _NBL_PLATFORM_WINDOWS_`
	`12`	`+`
`11`	`13`	`namespace nbl::asset::hlsl::impl`
`12`	`14`	`{`
`13`	`15`	`class DXC;`
`@@ -66,4 +68,6 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler`
`66`	`68`
`67`	`69`	`}`
`68`	`70`
	`71`	`+#endif`
	`72`	`+`
`69`	`73`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`#ifndef _NBL_CORE_STRING_LITERAL_H_INCLUDED_`
`5`	`5`	`#define _NBL_CORE_STRING_LITERAL_H_INCLUDED_`
`6`	`6`
	`7`	`+#include <algorithm>`
	`8`	`+`
`7`	`9`	`namespace nbl::core`
`8`	`10`	`{`
`9`	`11`