Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into nano-pipelines

Author: AnastaZIuk

.gitmodules

@@ -27,9 +27,6 @@
 	path = 3rdparty/libexpat
 	url = [email protected]:Devsh-Graphics-Programming/libexpat.git
 	branch = master
-[submodule "3rdparty/glm"]
-	path = 3rdparty/glm
-	url = [email protected]:AnastaZIuk/glm.git
 [submodule "3rdparty/freetype2"]
 	path = 3rdparty/freetype2
 	url = [email protected]:Devsh-Graphics-Programming/freetype.git
@@ -54,6 +51,7 @@
 [submodule "3rdparty/glTFSampleModels"]
 	path = 3rdparty/glTFSampleModels
 	url = [email protected]:Devsh-Graphics-Programming/glTF-Sample-Models.git
+	update = none
 [submodule "3rdparty/nbl_spirv_cross"]
 	path = 3rdparty/nbl_spirv_cross
 	url = [email protected]:devshgraphicsprogramming/SPIRV-Cross.git
@@ -89,7 +87,7 @@
 	url = [email protected]:Devsh-Graphics-Programming/Nabla-Continous-Integration-Python-Framework.git
 [submodule "3rdparty/boost/superproject"]
 	path = 3rdparty/boost/superproject
-	url = [email protected]:boostorg/boost.git
+	url = ../boost.git
 [submodule "3rdparty/argparse"]
 	path = 3rdparty/argparse
 	url = [email protected]:p-ranav/argparse.git
@@ -117,3 +115,6 @@
 [submodule "docker/compiler-explorer"]
 	path = docker/compiler-explorer
 	url = [email protected]:Devsh-Graphics-Programming/Compiler-Explorer-Docker.git
+[submodule "3rdparty/glm"]
+	path = 3rdparty/glm
+	url = [email protected]:Devsh-Graphics-Programming/glm.git

3rdparty/CMakeLists.txt

@@ -4,6 +4,9 @@
 
 include(../cmake/common.cmake)
 
+project(Nabla-3rdparty LANGUAGES CXX C)
+enable_language(C CXX ASM ASM_NASM)
+
 option(NBL_FORCE_RELEASE_3RDPARTY "Force map 3rdaprty's configuration regardless Nabla configuration to Release" OFF)
 option(NBL_FORCE_RELWITHDEBINFO_3RDPARTY "Force map 3rdaprty's configuration regardless Nabla configuration to RelWithDebInfo" OFF)
 
@@ -231,7 +234,7 @@ if(_NBL_COMPILE_WITH_OPEN_EXR_)
 endif()
 
 
-#gli
+# gli
 option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
 if(_NBL_COMPILE_WITH_GLI_)
 	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
@@ -240,12 +243,23 @@ if(_NBL_COMPILE_WITH_GLI_)
 	set(BUILD_SHARED_LIBS OFF)
 	set(BUILD_STATIC_LIBS OFF)
 	set(BUILD_TESTING OFF)
+	set(GLI_GLM_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/glm")
 	add_subdirectory(gli gli EXCLUDE_FROM_ALL)
 	set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 	set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 	set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 endif()
 
+set(ENABLE_STATIC_LIB ON)
+set(ENABLE_SHARED_LIB OFF)
+set(ENABLE_EXAMPLES OFF)
+set(ENABLE_DOCS OFF)
+set(ENABLE_APP OFF)
+set(ENABLE_LIB_ONLY ON)
+set(ENABLE_TESTS OFF)
+set(ENABLE_SUMMARY OFF)
+add_subdirectory(bzip2 bzip2 EXCLUDE_FROM_ALL)
+
 add_library(lzma OBJECT
 	lzma/C/Alloc.c
 	lzma/C/LzFind.c
@@ -262,17 +276,6 @@ add_library(lz4 OBJECT
 	lz4/lib/xxhash.c
 )
 
-
-add_library(bzip2 OBJECT
-	bzip2/blocksort.c
-	bzip2/bzlib.c
-	bzip2/compress.c
-	bzip2/crctable.c
-	bzip2/decompress.c
-	bzip2/huffman.c
-	bzip2/randtable.c
-)
-
 add_library(spirv_cross OBJECT
 	nbl_spirv_cross/spirv_cfg.cpp
 	nbl_spirv_cross/spirv_cross.cpp
@@ -419,12 +422,6 @@ add_library(aesGladman OBJECT
 
 add_subdirectory(argparse argparse EXCLUDE_FROM_ALL)
 
-option(GLM_TEST_ENABLE_SIMD_SSE4_2 "Enable SSE 4.2 optimizations" ON)
-option(GLM_TEST_ENABLE "Build unit tests" OFF)
-#add_subdirectory(glm EXCLUDE_FROM_ALL)
-set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
-set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
-
 if (NBL_BUILD_MITSUBA_LOADER)
    option(BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF)
    option(BUILD_examples "EXPAT: build the examples for expat library" OFF)
@@ -465,7 +462,7 @@ set(NBL_3RDPARTY_TARGETS
 				shaderc_util
 				shaderc
 				jpeg-static
-				bzip2
+				bz2_static
 				simdjson
 				nlohmann_json
 				glslang
@@ -496,11 +493,7 @@ if (NBL_BUILD_IMGUI)
 endif()
 
 foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
-		if(NBL_DYNAMIC_MSVC_RUNTIME)
-			set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-		else()
-			set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-		endif()
+		set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${NBL_COMPILER_DYNAMIC_RUNTIME}>:DLL>")
 
 		if(MSVC AND NBL_SANITIZE_ADDRESS)
 			set_property(TARGET ${trgt} PROPERTY COMPILE_OPTIONS /fsanitize=address)

3rdparty/boost/CMakeLists.txt

@@ -1,3 +1,81 @@
+get_filename_component(NBL_BOOST_WAVE_DEP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dep/wave.cmake" ABSOLUTE)
+
+# Boost uses it's own tool for generating dependency list for targets, therefore we 
+# can make sure manually added dependency subdirectories for a library are valid
+# https://www.boost.org/doc/libs/1_83_0/tools/boostdep/doc/html/index.html#boostdep.introduction.building_boostdep
+
+if(NBL_BOOST_GENERATE_DEP_LIST) # internal, for Nabla devs
+	if(NOT WIN32)
+		message(FATAL_ERROR "NBL_BOOST_GENERATE_DEP_LIST only for Windows host!")
+	endif()
+
+	macro(NBL_BOOST_EXECUTE)
+		execute_process(COMMAND ${ARGV} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/superproject")
+	endmacro()
+
+	NBL_BOOST_EXECUTE(git config --file .gitmodules --get-regexp path OUTPUT_VARIABLE NBL_OUTPUT_VARIABLE)
+	string(REGEX REPLACE "\n" ";" NBL_SUBMODULE_CONFIG_LIST "${NBL_OUTPUT_VARIABLE}")
+
+	foreach(NBL_SUBMODULE_NAME ${NBL_SUBMODULE_CONFIG_LIST})
+		string(REGEX MATCH "submodule\\.(.*)\\.path" NBL_SUBMODULE_NAME "${NBL_SUBMODULE_NAME}")
+		list(APPEND BOOST_SUBMODULES "${CMAKE_MATCH_1}")
+	endforeach()
+
+	# sync & force update of all boost modules first for the tool purpose (sry guys who use the tool, you need to clone all, I want to keep it simple)
+	NBL_BOOST_EXECUTE(git submodule sync)
+	list(APPEND BOOST_FORCE_ALL_CONFIG -c url.https://github.com/[email protected]:)
+	foreach(SUBMODULE ${BOOST_SUBMODULES})
+		list(APPEND BOOST_FORCE_ALL_CONFIG -c submodule.${SUBMODULE}.update=checkout)
+	endforeach()
+
+	NBL_BOOST_EXECUTE(git ${BOOST_FORCE_ALL_CONFIG} submodule update --init --recursive -f)
+
+	# build boost dep executable
+	set(NBL_BOOSTDEP_EXE "boostdep.exe")
+	set(NBL_BOOSTDEP_EXE_FILEPATH "${CMAKE_CURRENT_BINARY_DIR}/superproject/tools/boostdep/bin/${NBL_BOOSTDEP_EXE}")
+	if(NOT EXISTS "${NBL_BOOSTDEP_EXE_FILEPATH}")
+		NBL_BOOST_EXECUTE(cmd /C bootstrap.bat)
+		NBL_BOOST_EXECUTE(cmd /C b2.exe tools/boostdep/build)
+		NBL_BOOST_EXECUTE("${CMAKE_COMMAND}" -E copy "./dist/bin/${NBL_BOOSTDEP_EXE}" "${NBL_BOOSTDEP_EXE_FILEPATH}")
+		NBL_BOOST_EXECUTE(git clean -fdx)
+		NBL_BOOST_EXECUTE(git reset --hard)
+	endif()
+
+	# get wave dependency info
+	NBL_BOOST_EXECUTE("${NBL_BOOSTDEP_EXE_FILEPATH}" --boost-root "${CMAKE_CURRENT_SOURCE_DIR}/superproject" --brief wave
+		OUTPUT_VARIABLE NBL_OUTPUT_VAR
+	)
+
+	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "${NBL_OUTPUT_VAR}")
+
+	file(STRINGS "${NBL_BOOST_WAVE_DEP_FILE}" NBL_BOOST_LIBS)
+	set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})
+	list(POP_FRONT NBL_BOOST_LIBS)
+	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "#")
+	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "(unknown)")
+	string(REPLACE "~" "/" NBL_BOOST_LIBS "${NBL_BOOST_LIBS}")
+
+	# update boost .gitmodules configuration, discard all but modules reported by wave
+	# NOTE: you commit this file to version control AND boost's .gitmodules *if got changed*,
+	# use when updating boost to more recent version
+	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})")
+
+	message(STATUS "Updating boost .gitmodules")
+	foreach(SUBMODULE ${BOOST_SUBMODULES})
+		# 1) fallback, ignore all
+		NBL_BOOST_EXECUTE(git config --file .gitmodules submodule.${SUBMODULE}.update none)
+	endforeach()
+
+	foreach(NAME ${NBL_BOOST_LIBS})
+		string(REPLACE "/" "_" SUBMODULE "${NAME}")
+		message(STATUS "WAVE BOOST DEP SUBMODULE = ${SUBMODULE}")
+		# 2) pick only submodules reported by wave
+		NBL_BOOST_EXECUTE(git config --file .gitmodules submodule.${SUBMODULE}.update checkout)
+	endforeach()
+	# 3) and the top module itself
+	NBL_BOOST_EXECUTE(git config --file .gitmodules submodule.wave.update checkout)
+endif()
+
 set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/superproject/libs/preprocessor/include" CACHE PATH "" FORCE)
 
 get_filename_component(_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_ "${BOOST_PREPROCESSOR_INCLUDE}" ABSOLUTE)
@@ -17,8 +95,6 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
     ADD_CUSTOM_BUILTIN_RESOURCES(boostBuiltinResourceData BOOST_RESOURCES_TO_EMBED "${_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_}" "boost" "boost::builtin" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "${_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_}" "STATIC" "INTERNAL")
 endif()
 
-get_filename_component(NBL_BOOST_WAVE_DEP_FILE "${CMAKE_CURRENT_SOURCE_DIR}/dep/wave.cmake" ABSOLUTE)
-
 if(NOT EXISTS "${NBL_BOOST_WAVE_DEP_FILE}")
 	message(FATAL_ERROR "Internal error, generate NBL_BOOST_WAVE_DEP_FILE by enabling NBL_BOOST_GENERATE_DEP_LIST!")
 endif()
@@ -41,47 +117,4 @@ endforeach()
 
 set(NBL_BOOST_TARGETS 
 	${NBL_BOOST_TARGETS}
-PARENT_SCOPE)
-
-# Boost uses it's own tool for generating dependency list for targets, therefore we 
-# can make sure manually added dependnecy subdirectories for a library are valid
-# https://www.boost.org/doc/libs/1_83_0/tools/boostdep/doc/html/index.html#boostdep.introduction.building_boostdep
-
-if(NBL_BOOST_GENERATE_DEP_LIST) # internal, for Nabla devs
-	if(WIN32)
-		set(NBL_BOOSTDEP_EXE "boostdep.exe")
-	else()
-		set(NBL_BOOSTDEP_EXE "boostdep")
-	endif()
-	
-	set(NBL_BOOSTDEP_EXE_FILEPATH "${CMAKE_CURRENT_BINARY_DIR}/superproject/tools/boostdep/bin/${NBL_BOOSTDEP_EXE}")
-	
-	if(NOT EXISTS "${NBL_BOOSTDEP_EXE_FILEPATH}")
-		macro(NBL_BOOST_EXECUTE)
-			execute_process(COMMAND ${ARGV}
-				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/superproject"
-			)
-		endmacro()
-
-		NBL_BOOST_EXECUTE(cmd /C bootstrap.bat)
-		NBL_BOOST_EXECUTE(cmd /C b2.exe tools/boostdep/build)
-		NBL_BOOST_EXECUTE("${CMAKE_COMMAND}" -E copy "./dist/bin/${NBL_BOOSTDEP_EXE}" "${NBL_BOOSTDEP_EXE_FILEPATH}")
-		NBL_BOOST_EXECUTE(git clean -fdx)
-		NBL_BOOST_EXECUTE(git reset --hard)
-	endif()
-
-	execute_process(COMMAND "${NBL_BOOSTDEP_EXE_FILEPATH}" --boost-root "${CMAKE_CURRENT_SOURCE_DIR}/superproject" --brief wave
-		OUTPUT_VARIABLE NBL_OUTPUT_VAR
-	)
-
-	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "${NBL_OUTPUT_VAR}")
-
-	file(STRINGS "${NBL_BOOST_WAVE_DEP_FILE}" NBL_BOOST_LIBS)
-	set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})
-	list(POP_FRONT NBL_BOOST_LIBS)
-	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "#")
-	list(FILTER NBL_BOOST_LIBS EXCLUDE REGEX "(unknown)")
-	string(REPLACE "~" "/" NBL_BOOST_LIBS "${NBL_BOOST_LIBS}")
-
-	file(WRITE "${NBL_BOOST_WAVE_DEP_FILE}" "set(NBL_BOOST_LIBS ${NBL_BOOST_LIBS})")
-endif()
+PARENT_SCOPE)

3rdparty/boost/superproject

@@ -63,11 +63,7 @@ if(WIN32)
 	endif()
 endif()
 
-if(NBL_DYNAMIC_MSVC_RUNTIME)
-	list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-else()
-	list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>")		
-endif()
+list(APPEND NBL_DXC_CMAKE_OPTIONS "-DCMAKE_MSVC_RUNTIME_LIBRARY:STATIC=MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${NBL_COMPILER_DYNAMIC_RUNTIME}>:DLL>")
 
 # perform DXC compile standard requirement test
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

3rdparty/bzip2

@@ -1,11 +1,24 @@
 # Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
 # This file is part of the "Nabla Engine".
 # For conditions of distribution and use, see copyright notice in nabla.h.in or nabla.h
+cmake_minimum_required(VERSION 3.31)
 
-cmake_minimum_required(VERSION 3.29)
-cmake_policy(SET CMP0112 NEW)
-cmake_policy(SET CMP0141 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0141.html#policy:CMP0141
-cmake_policy(SET CMP0118 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0118.html#policy:CMP0118
+# TODO: Yas - once we deploy 4.x we will fire `cmake_policy(VERSION <min>[...<max>])` instead of manually picking policies
+# https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html#policy-version
+# also we should update deps which throw warnings about < 3.10 compatibility
+
+macro(NBL_POLICY P S)
+if(POLICY ${P})
+	cmake_policy(SET ${P} ${S})
+	set(CMAKE_POLICY_DEFAULT_${P} ${S})
+endif()
+endmacro()
+
+NBL_POLICY(CMP0003 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0003.html#cmp0003
+NBL_POLICY(CMP0077 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0077.html#cmp0077
+NBL_POLICY(CMP0112 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0112.html#cmp0112
+NBL_POLICY(CMP0141 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0141.html#policy:CMP0141
+NBL_POLICY(CMP0118 NEW) # https://cmake.org/cmake/help/latest/policy/CMP0118.html#policy:CMP0118
 
 set(NBL_BUILD_ANDROID OFF)
 
@@ -21,28 +34,16 @@ if(MSVC)
 endif()
 
 option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
-option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)
+option(NBL_COMPILER_DYNAMIC_RUNTIME "" ON)
 option(NBL_SANITIZE_ADDRESS OFF)
 
-if(MSVC)
-	if(NBL_SANITIZE_ADDRESS)
-		set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>")
-	else()
-		set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug>:EditAndContinue>$<$<CONFIG:RelWithDebInfo>:ProgramDatabase>")
-	endif()
-endif()
+set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT $<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>) # ignored on non xMSVC-ABI targets
 
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")
 else()
-	if(MSVC)
-		if(NBL_DYNAMIC_MSVC_RUNTIME)
-			message(STATUS "Shared Nabla build enabled!")
-		else()
-			message(FATAL_ERROR "Turn NBL_DYNAMIC_MSVC_RUNTIME on! For dynamic Nabla builds dynamic MSVC runtime is mandatory!")
-		endif()
-	else()
-		message(FATAL_ERROR "Nabla can't be built with shared libraries! Please make sure you are targetting Windows OS and MSVC compiler!")
+	if(NOT NBL_COMPILER_DYNAMIC_RUNTIME)
+		message(FATAL_ERROR "Turn NBL_COMPILER_DYNAMIC_RUNTIME on! For dynamic Nabla builds dynamic runtime is mandatory!")
 	endif()
 endif()