Merge branch 'master' into HEAD

Author: deprilula28

.gitignore

@@ -26,6 +26,6 @@ doctemp/*
 source/obj
 source/Irrlicht/libIrrlichtServer.a
 # stuff output by examples
-examples_tests/*/bin/*
+examples_tests/*
 examples_tests/tmp/*
 android-sample/bin/*

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "3rdparty/SPIRV-Headers"]
-	path = 3rdparty/SPIRV-Headers
-	url = https://github.com/KhronosGroup/SPIRV-Headers.git
-[submodule "3rdparty/SPIRV-Tools"]
-	path = 3rdparty/SPIRV-Tools
-	url = https://github.com/KhronosGroup/SPIRV-Tools.git
 [submodule "3rdparty/glslang"]
 	path = 3rdparty/glslang
 	url = https://github.com/devshgraphicsprogramming/glslang.git
@@ -55,19 +49,12 @@
 [submodule "3rdparty/parallel-hashmap"]
 	path = 3rdparty/parallel-hashmap
 	url = https://github.com/greg7mdp/parallel-hashmap
-[submodule "3rdparty/radeonrays"]
-	path = 3rdparty/radeonrays
-	url = git@github.com:devshgraphicsprogramming/RadeonRays_SDK.git
-	branch = baw
 [submodule "3rdparty/jitify"]
 	path = 3rdparty/jitify
 	url = https://github.com/NVIDIA/jitify
 [submodule "3rdparty/volk"]
 	path = 3rdparty/volk
 	url = https://github.com/zeux/volk.git
-[submodule "3rdparty/EGL"]
-	path = 3rdparty/EGL
-	url = https://github.com/Crisspl/EGL.git
 [submodule "3rdparty/simdjson"]
 	path = 3rdparty/simdjson
 	url = https://github.com/simdjson/simdjson.git
@@ -87,3 +74,13 @@
 	path = 3rdparty/Vulkan-Headers
 	url = git@github.com:KhronosGroup/Vulkan-Headers.git
 	branch = main
+[submodule "examples_tests"]
+	path = examples_tests
+	url = git@github.com:Devsh-Graphics-Programming/Nabla-Examples-and-Tests.git
+[submodule "3rdparty/dxc/dxc"]
+	path = 3rdparty/dxc/dxc
+	url = git@github.com:Devsh-Graphics-Programming/DirectXShaderCompiler.git
+	branch = devshFixes
+[submodule "3rdparty/tcpp"]
+	path = 3rdparty/tcpp
+	url = git@github.com:Erfan-Ahmadi/tcpp.git

3rdparty/CMakeLists.txt

@@ -4,35 +4,6 @@
 
 include(../cmake/common.cmake)
 
-# mandatory
-option(NBL_UPDATE_GIT_SUBMODULE "" ON)
-
-if(NBL_UPDATE_GIT_SUBMODULE)
-	update_git_submodule(./volk)
-	update_git_submodule(./SPIRV-Headers)
-	update_git_submodule(./SPIRV-Tools)
-	update_git_submodule(./glslang)
-	update_git_submodule(./shaderc)
-	update_git_submodule(./bzip2)
-	update_git_submodule(./lz4)
-	update_git_submodule(./nbl_spirv_cross)
-	update_git_submodule(./zlib)
-	update_git_submodule(./openexr)
-	update_git_submodule(./libpng)
-	update_git_submodule(./openssl)
-	update_git_submodule(./libjpeg-turbo)
-	update_git_submodule(./parallel-hashmap)
-	update_git_submodule(./gli)
-	# exceptions that get automatically cloned
-	update_git_submodule(./glm)
-	update_git_submodule(./freetype2)
-	update_git_submodule(./portable-file-dialogs)
-	update_git_submodule(./simdjson)
-	update_git_submodule(./glTFSampleModels)
-	update_git_submodule(./pstl/oneTBB)
-	update_git_submodule(./pstl/oneDPL/oneDPL)
-endif()
-
 # simdjson
 set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_BUILD_STATIC_LIBS ${BUILD_STATIC_LIBS})
@@ -45,10 +16,24 @@ set(BUILD_SHARED_LIBS ${_OLD_BUILD_SHARED_LIBS})
 set(BUILD_STATIC_LIBS ${_OLD_BUILD_STATIC_LIBS})
 set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 
-
 # openssl
 add_subdirectory(openssl openssl EXCLUDE_FROM_ALL)
 
+# DXC
+set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers")
+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")
+add_subdirectory(dxc dxc EXCLUDE_FROM_ALL)
+
+if(_NBL_ENABLE_DXC_COMPILE_TESTS_)
+	message(STATUS "_NBL_ENABLE_DXC_COMPILE_TESTS_ enabled, DXC compile test target will be executed at build time!")
+endif()
 
 # volk
 set(VOLK_PULL_IN_VULKAN OFF CACHE INTERNAL "" FORCE) # Needed to make sure vulkan library will not be linked in examples
@@ -66,28 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 endif()
 
 
-# TODO: redo
-find_package(OpenGL OPTIONAL_COMPONENTS EGL)
-find_package(Wayland)  # TODO: remove, load Wayland dynamically
-#[[if (OpenGL_EGL_FOUND)
-	message(FATAL_ERROR "FOUND EGL!!")
-else()
-	message(FATAL_ERROR "COULDNT FIND EGL!!")
-endif()]]
-# EGL
-set(EGL_NO_GLEW ON CACHE INTERNAL "" FORCE)
-if (OpenGL_EGL_FOUND AND UNIX AND NOT APPLE)
-	# TODO: This Cannot work like that!
-	set(EGL_PASSTHROUGH ON FORCE)
-	if (WAYLAND_CLIENT_FOUND)
-		set(EGL_USE_WAYLAND ON FORCE)
-		message(FATAL_ERROR "Using Wayland backend!!!")
-	endif()
-endif()
-# all of the above fuckery can be dismissed
-add_subdirectory(EGL/EGL)
-
-
 # zlib (target is zlibstatic)
 set(_OLD_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
 set(_OLD_SKIP_INSTALL_ALL ${SKIP_INSTALL_ALL})
@@ -140,14 +103,13 @@ set(ZLIB_LIBRARY # for PNGLIB purposes
 		$<$<CONFIG:RelWithDebInfo>:${ZLIB_LIBRARY_RELWITHDEBINFO}>
 CACHE INTERNAL "" FORCE)
 
-
 set(SPIRV_HEADERS_SKIP_INSTALL ON CACHE INTERNAL "Skip SPIRV-Headers install")
 set(SPIRV_HEADERS_SKIP_EXAMPLES ON CACHE INTERNAL "Skip SPIRV-Headers examples")
-add_subdirectory(SPIRV-Headers SPIRV-Headers EXCLUDE_FROM_ALL)
+add_subdirectory(dxc/dxc/external/SPIRV-Headers dxc/external/SPIRV-Headers EXCLUDE_FROM_ALL)
 set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE INTERNAL "Skip SPIRV-Tools install")
 set(SPIRV_SKIP_TESTS ON CACHE INTERNAL "Skip SPIRV-Tools tests")
 set(SPIRV_SKIP_EXECUTABLES ON CACHE INTERNAL "Skip SPIRV-Tools executable build")
-add_subdirectory(SPIRV-Tools SPIRV-Tools EXCLUDE_FROM_ALL)
+add_subdirectory(dxc/dxc/external/SPIRV-Tools dxc/external/SPIRV-Tools EXCLUDE_FROM_ALL)
 set(SKIP_GLSLANG_INSTALL ON CACHE INTERNAL "Skip glslang install")
 set(ENABLE_SPVREMAPPER OFF CACHE INTERNAL "SPVRemapper is a spirv compression experimental library")
 set(ENABLE_GLSLANG_BINARIES OFF CACHE INTERNAL "Build glslangValidator and spirv-remap?")
@@ -359,16 +321,16 @@ set(NBL_3RDPARTY_TARGETS
 				shaderc_util
 				shaderc
 				jpeg-static
-				bzip2			
+				bzip2
+				simdjson
 				glslang
 				OGLCompiler 
 				OSDependent
 				MachineIndependent
 				GenericCodeGen
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
-				SPIRV-Tools-opt
-				egl 
+				SPIRV-Tools-opt 
 )
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
 	list(APPEND NBL_3RDPARTY_TARGETS
@@ -399,8 +361,11 @@ if(ENABLE_HLSL)
 endif()
 
 foreach(trgt IN LISTS NBL_3RDPARTY_TARGETS)
-		set_property(TARGET ${trgt} PROPERTY
-             MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		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()
 endforeach()
 
 set(_NBL_3RDPARTY_TARGETS_ ${NBL_3RDPARTY_TARGETS} PARENT_SCOPE)