Merge branch 'master' into cad_shaders_work

# Conflicts:
#	3rdparty/CMakeLists.txt
#	3rdparty/boost/CMakeLists.txt
#	include/nbl/builtin/hlsl/cpp_compat/vector.hlsl

Author: Erfan-Ahmadi

.gitignore

@@ -28,3 +28,4 @@ android-sample/bin/*
 # shader debug sideeffects
 preprocessed.hlsl
 compiled.spv
+.vs/*

3rdparty/CMakeLists.txt

@@ -160,24 +160,34 @@ add_subdirectory(libpng libpng EXCLUDE_FROM_ALL)
 add_dependencies(png_static zlibstatic)
 
 
-#openexr
+# OpenEXR
 option(_NBL_COMPILE_WITH_OPEN_EXR_ "Build with OpenEXR library" ON)
-if (_NBL_COMPILE_WITH_OPEN_EXR_)
-	set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
-	set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
-	set(_OLD_BUILD_TESTING ${BUILD_TESTING})
-	set(BUILD_SHARED_LIBS OFF)
-	set(BUILD_STATIC_LIBS OFF)
-	set(BUILD_TESTING OFF)
-	set(PYILMBASE_ENABLE OFF CACHE STRING "" FORCE)
-	set(OPENEXR_BUILD_UTILS OFF CACHE STRING "" FORCE)
-	set(OPENEXR_VIEWERS_ENABLE OFF CACHE STRING "" FORCE)
-	add_subdirectory(openexr openexr 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()
 
+# Note we are adding it anyway regardless _NBL_COMPILE_WITH_OPEN_EXR_, its because we need Half dependecy 
+# it generates on fly in its build directory which doesnt have to be linked (class with inline methods), 
+# here is where _NBL_COMPILE_WITH_OPEN_EXR_ plays a role - when disabled OpenEXR won't be built and linked
+# but it's core 
+
+set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
+set(_OLD_BUILD_TESTING ${BUILD_TESTING})
+set(BUILD_SHARED_LIBS OFF)
+set(BUILD_STATIC_LIBS OFF)
+set(BUILD_TESTING OFF)
+set(PYILMBASE_ENABLE OFF CACHE STRING "" FORCE)
+set(OPENEXR_BUILD_UTILS OFF CACHE STRING "" FORCE)
+set(OPENEXR_FORCE_INTERNAL_IMATH ON CACHE STRING "" FORCE) # TODO: make it a submodule and force using it maybe instead of letting OpenEXR download it from it's github repository
+set(OPENEXR_BUILD_TOOLS OFF CACHE STRING "" FORCE) 
+set(OPENEXR_INSTALL OFF CACHE STRING "" FORCE)
+set(OPENEXR_INSTALL_DOCS OFF CACHE STRING "" FORCE)
+set(OPENEXR_INSTALL_EXAMPLES OFF CACHE STRING "" FORCE)
+set(OPENEXR_INSTALL_PKG_CONFIG OFF CACHE STRING "" FORCE)
+set(OPENEXR_INSTALL_TOOLS OFF CACHE STRING "" FORCE)
+
+add_subdirectory(openexr openexr 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})
 
 #gli
 option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
@@ -194,10 +204,6 @@ if(_NBL_COMPILE_WITH_GLI_)
 	set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 endif()
 
-
-nbl_adjust_flags()
-
-
 add_library(lzma OBJECT
 	lzma/C/Alloc.c
 	lzma/C/LzFind.c
@@ -295,12 +301,7 @@ option(GLM_TEST_ENABLE "Build unit tests" OFF)
 set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 
-
 if (NBL_BUILD_MITSUBA_LOADER)
-	if(NBL_UPDATE_GIT_SUBMODULE)
-		update_git_submodule(./libexpat)
-	endif()
-
    option(BUILD_tools "EXPAT: build the xmlwf tool for expat library" OFF)
    option(BUILD_examples "EXPAT: build the examples for expat library" OFF)
    option(BUILD_tests "EXPAT: build the tests for expat library" OFF)
@@ -321,26 +322,14 @@ if (NBL_BUILD_MITSUBA_LOADER)
    set(MITSUBA_LOADER_DEPENDENT_LIBS ${MITSUBA_LOADER_DEPENDENT_LIBS} PARENT_SCOPE)
 endif()
 
-
 if (NBL_BUILD_BULLET)
-	if(NBL_UPDATE_GIT_SUBMODULE)
-		update_git_submodule(./bullet3)
-	endif()
 	set(BULLET_INCLUDE_PATH
 		${CMAKE_CURRENT_SOURCE_DIR}/bullet3/src
 	)
 
 	set(BULLET_INCLUDE_PATH ${BULLET_INCLUDE_PATH} PARENT_SCOPE)
 endif()
 
-
-if (NBL_COMPILE_WITH_CUDA)
-	if(NBL_UPDATE_GIT_SUBMODULE)
-		update_git_submodule(./jitify)
-	endif()
-endif()
-
-
 # Final gather
 set(NBL_3RDPARTY_TARGETS
 				lzma
@@ -362,18 +351,15 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
 				SPIRV-Tools-opt
+				Imath
+				OpenEXRCore
 				${NBL_BOOST_TARGETS}
 )
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
 	list(APPEND NBL_3RDPARTY_TARGETS
-	    IlmBaseConfig
-		IlmImfConfig
-		Imath
-		IlmThread
-		IlmImf
-		Half
+		OpenEXR
 		Iex
-		IexMath
+		IlmThread
 	)
 endif()
 if(ANDROID AND NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
@@ -398,11 +384,17 @@ foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
 		else()
 			set_property(TARGET ${trgt} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 		endif()
+		
+		if(MSVC AND NBL_SANITIZE_ADDRESS)
+			set_property(TARGET ${trgt} PROPERTY COMPILE_OPTIONS /fsanitize=address)
+		endif()
 endforeach()
 
 add_custom_target(3rdparty)
 add_dependencies(3rdparty ${NBL_3RDPARTY_TARGETS})
 
+nbl_adjust_flags()
+
 set(_NBL_3RDPARTY_TARGETS_ ${NBL_3RDPARTY_TARGETS} PARENT_SCOPE)
 
 ## REMINDER / NOTE : This is how we install 3rdparty headers we need !

3rdparty/boost/CMakeLists.txt

@@ -17,18 +17,70 @@ 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()
 
-set(BOOST_INCLUDE_LIBRARIES wave)
+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()
+
 set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
-add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)
+include("${NBL_BOOST_WAVE_DEP_FILE}")
+
+foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
+	add_subdirectory(superproject/libs/${BOOST_LIB} EXCLUDE_FROM_ALL)
+endforeach()
 
-set(NBL_BOOST_LIBS wave;assert;concept_check;config;core;filesystem;format;iterator;lexical_cast;mpl;multi_index;optional;pool;preprocessor;serialization;smart_ptr;spirit;static_assert;throw_exception;type_traits;atomic;container_hash;detail;io;predef;system;winapi;utility;conversion;function_types;fusion;container;integer;numeric/conversion;bind;move;tuple;array;function;mp11;variant;variant2;endian;phoenix;proto;range;regex;thread;typeof;unordered;align;intrusive;describe;functional;chrono;date_time;exception;type_index;ratio;algorithm;tokenizer)
+add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)
 
 foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
-if(TARGET boost_${BOOST_LIB})
-	list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
-endif()
+	if(TARGET boost_${BOOST_LIB})
+		list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
+	endif()
 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()

3rdparty/boost/dep/wave.cmake

@@ -0,0 +1 @@
+set(NBL_BOOST_LIBS assert;concept_check;config;core;filesystem;format;iterator;lexical_cast;mpl;multi_index;optional;pool;preprocessor;serialization;smart_ptr;spirit;static_assert;throw_exception;type_traits;atomic;container_hash;detail;io;predef;system;winapi;utility;conversion;function_types;fusion;container;integer;numeric/conversion;bind;move;tuple;array;function;mp11;variant;variant2;endian;phoenix;proto;range;regex;thread;typeof;unordered;align;intrusive;describe;functional;chrono;date_time;exception;type_index;ratio;algorithm;tokenizer)

3rdparty/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h

@@ -0,0 +1,38 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_BROADPHASE_CALLBACK_H
+#define B3_BROADPHASE_CALLBACK_H
+
+#include "Bullet3Common/b3Vector3.h"
+struct b3BroadphaseProxy;
+
+struct b3BroadphaseAabbCallback
+{
+	virtual ~b3BroadphaseAabbCallback() {}
+	virtual bool process(const b3BroadphaseProxy* proxy) = 0;
+};
+
+struct b3BroadphaseRayCallback : public b3BroadphaseAabbCallback
+{
+	///added some cached data to accelerate ray-AABB tests
+	b3Vector3 m_rayDirectionInverse;
+	unsigned int m_signs[3];
+	b3Scalar m_lambda_max;
+
+	virtual ~b3BroadphaseRayCallback() {}
+};
+
+#endif  //B3_BROADPHASE_CALLBACK_H