Merge branch 'master' into erfan_device_features

# Conflicts:
#	include/nbl/video/utilities/IUtilities.h

Author: Erfan-Ahmadi

.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

@@ -87,3 +87,6 @@
 	path = 3rdparty/Vulkan-Headers
 	url = [email protected]:KhronosGroup/Vulkan-Headers.git
 	branch = main
+[submodule "examples_tests"]
+	path = examples_tests
+	url = [email protected]:Devsh-Graphics-Programming/Nabla-Examples-and-Tests.git

3rdparty/CMakeLists.txt

@@ -342,7 +342,8 @@ set(NBL_3RDPARTY_TARGETS
 				shaderc_util
 				shaderc
 				jpeg-static
-				bzip2			
+				bzip2
+				simdjson
 				glslang
 				OGLCompiler 
 				OSDependent
@@ -379,8 +380,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)

CMakeLists.txt

@@ -15,6 +15,23 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
 
+option(NBL_STATIC_BUILD "" ON) # ON for static builds, OFF for shared
+option(NBL_DYNAMIC_MSVC_RUNTIME "" OFF)
+
+if(NBL_STATIC_BUILD)
+	message(STATUS "Static Nabla build enabled!")
+else()
+	if(WIN32 AND 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!")
+	endif()
+endif()
+
 if(NBL_BUILD_ANDROID)
 	enable_language(ASM)
 endif()
@@ -232,6 +249,12 @@ elseif(UNIX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
 endif()
 
+if(NBL_STATIC_BUILD)
+	unset(_NBL_SHARED_BUILD_ CACHE)
+else()
+	set(_NBL_SHARED_BUILD_ ON CACHE INTERNAL "")
+endif()
+
 #uncomment in the future
 #option(NBL_TARGET_ARCH_ARM "Build for ARM?" OFF)
 

README.md

@@ -177,6 +177,22 @@ Contact `[email protected]` with inquires into contracting.
 
 - [ ] **iOS**
 
+## Build summary
+
+|    ![][BUILD_STATUS]     |   Release    |     RWDI     |    Debug     |
+| :----------------------: | :----------: | :----------: | :----------: |
+|   **Windows MSVC x64**   | ![][MSVC_1]  | ![][MSVC_2]  | ![][MSVC_3]  |
+| **Android Clang x86_64** | ![][CLANG_1] | ![][CLANG_2] | ![][CLANG_3] |
+|    **Linux GCC x64**     |   ![][NA]    |   ![][NA]    |   ![][NA]    |
+
+[MSVC_1]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DRelease%2CDEVSH_NODES%3Dpredator15%2CDEVSH_OS%3DWindows
+[MSVC_2]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DRelWithDebInfo%2CDEVSH_NODES%3Dpredator15%2CDEVSH_OS%3DWindows
+[MSVC_3]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DDebug%2CDEVSH_NODES%3Dpredator15%2CDEVSH_OS%3DWindows
+[CLANG_1]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DRelease%2CDEVSH_NODES%3Dnode1%2CDEVSH_OS%3DAndroid
+[CLANG_2]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DRelWithDebInfo%2CDEVSH_NODES%3Dnode1%2CDEVSH_OS%3DAndroid
+[CLANG_3]: https://ci.devsh.eu/buildStatus/icon?job=BuildNabla%2FDEVSH_CONFIGURATIONS%3DDebug%2CDEVSH_NODES%3Dnode1%2CDEVSH_OS%3DAndroid
+[NA]: https://img.shields.io/badge/free%20slot-n%2Fa-red
+[BUILD_STATUS]: https://img.shields.io/badge/build-status-blueviolet
 
 ## Required Build Tools and SDK's
 

cmake/common.cmake

@@ -39,14 +39,41 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
 	if(ANDROID)
 		add_library(${EXECUTABLE_NAME} SHARED main.cpp ${_EXTRA_SOURCES})
 	else()
-		add_executable(${EXECUTABLE_NAME} main.cpp ${_EXTRA_SOURCES})
-	endif()
+		if(NOT NBL_STATIC_BUILD)
+			set(NBL_CONFIG_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
+			set(NBL_CONFIG_OUTPUT_FILE ${NBL_CONFIG_OUTPUT_DIRECTORY}/${EXECUTABLE_NAME}$<IF:$<CONFIG:Release>,,$<IF:$<CONFIG:Debug>,_d,_rwdi>>.exe.config)
+			
+			add_custom_command(OUTPUT "${NBL_CONFIG_OUTPUT_FILE}"
+				COMMAND ${CMAKE_COMMAND} -DNBL_ROOT_PATH:PATH=${NBL_ROOT_PATH} -DNBL_GEN_DIRECTORY:PATH=${NBL_CONFIG_OUTPUT_DIRECTORY} -DNBL_DLL_PATH:FILEPATH=$<TARGET_FILE:Nabla> -DNBL_TARGET_PATH:FILEPATH=$<TARGET_FILE:${EXECUTABLE_NAME}> -P ${NBL_ROOT_PATH}/cmake/scripts/nbl/applicationMSVCConfig.cmake
+				COMMENT "Launching ${EXECUTABLE_NAME}.exe.config generation script!"
+				VERBATIM
+			)
+			
+			add_custom_target(${EXECUTABLE_NAME}_with_config ALL DEPENDS ${NBL_CONFIG_OUTPUT_FILE} ${NBL_ROOT_PATH}/cmake/scripts/nbl/applicationMSVCConfig.cmake)
+		endif()
 
-	set_property(TARGET ${EXECUTABLE_NAME} PROPERTY
-             MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		set(NBL_EXECUTABLE_SOURCES 
+			main.cpp
+			${_EXTRA_SOURCES}
+		)
+		
+		add_executable(${EXECUTABLE_NAME} ${NBL_EXECUTABLE_SOURCES})
+		
+		if(NBL_DYNAMIC_MSVC_RUNTIME)
+			set_property(TARGET ${EXECUTABLE_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+		else()
+			set_property(TARGET ${EXECUTABLE_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+		endif()
+	endif()
 
 	# EXTRA_SOURCES is var containing non-common names of sources (if any such sources, then EXTRA_SOURCES must be set before including this cmake code)
-	add_dependencies(${EXECUTABLE_NAME} Nabla)
+	if(NBL_STATIC_BUILD)
+		add_dependencies(${EXECUTABLE_NAME} Nabla)
+	else()
+		add_dependencies(${EXECUTABLE_NAME}_with_config Nabla_with_manifest)
+		#target_link_options(${EXECUTABLE_NAME} PRIVATE "/manifestdependency:\"type='win32' name='devshgraphicsprogramming.nabla' version='1.2.3.4' processorArchitecture='x86' language='*'\"")
+	endif()
+	
 	get_target_property(NBL_EGL_INCLUDE_DIRECORIES egl INCLUDE_DIRECTORIES)
 
 	target_include_directories(${EXECUTABLE_NAME}
@@ -582,13 +609,17 @@ macro(glue_source_definitions NBL_TARGET NBL_REFERENCE_RETURN_VARIABLE)
 	foreach(_NBL_DEF_ IN LISTS ${NBL_REFERENCE_RETURN_VARIABLE})
 		string(FIND "${_NBL_DEF_}" "=" _NBL_POSITION_ REVERSE)
 
+		# put target compile definitions without any value into wrapper file
 		if(_NBL_POSITION_ STREQUAL -1)
-			string(APPEND WRAPPER_CODE 
-				"#ifndef ${_NBL_DEF_}\n"
-				"#define ${_NBL_DEF_}\n"
-				"#endif // ${_NBL_DEF_}\n\n"
-			)
+			if(NOT ${_NBL_DEF_} STREQUAL "__NBL_BUILDING_NABLA__")
+				string(APPEND WRAPPER_CODE 
+					"#ifndef ${_NBL_DEF_}\n"
+					"#define ${_NBL_DEF_}\n"
+					"#endif // ${_NBL_DEF_}\n\n"
+				)
+			endif()
 		else()
+			# put target compile definitions with an assigned value into wrapper file
 			string(SUBSTRING "${_NBL_DEF_}" 0 ${_NBL_POSITION_} _NBL_CLEANED_DEF_)
 
 			string(LENGTH "${_NBL_DEF_}" _NBL_DEF_LENGTH_)

cmake/config/msvc/application.exe.config

@@ -0,0 +1,7 @@
+<configuration>   
+   <windows>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <probing privatePath="@NBL_ASSEMLBY_RELATIVE_PATH@"/>
+    </assemblyBinding>
+  </windows>
+</configuration>

cmake/manifest/msvc/devshgraphicsprogramming.nabla.manifest

@@ -0,0 +1,4 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <assemblyIdentity name="devshgraphicsprogramming.nabla" version="1.2.3.4" processorArchitecture="x86" type="win32"/>
+    <file name="@NABLA_DLL@"/>
+</assembly>

cmake/scripts/nbl/applicationMSVCConfig.cmake

@@ -0,0 +1,46 @@
+# Copyright (c) 2022 DevSH Graphics Programming Sp. z O.O.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# CMake script for generating msvc manifest during build time
+
+if(DEFINED NBL_ROOT_PATH)
+	if(NOT EXISTS ${NBL_ROOT_PATH})
+		message(FATAL_ERROR "NBL_ROOT_PATH as '${NBL_ROOT_PATH}' is invalid!")
+	endif()
+else()
+	message(FATAL_ERROR "NBL_ROOT_PATH variable must be specified for this script!")
+endif()
+
+if(NOT DEFINED NBL_GEN_DIRECTORY)
+	message(FATAL_ERROR "NBL_GEN_DIRECTORY variable must be specified for this script!")
+endif()
+
+if(NOT DEFINED NBL_DLL_PATH)
+	message(FATAL_ERROR "NABLA_DLL_PATH variable must be specified for this script!")
+endif()
+
+if(NOT DEFINED NBL_TARGET_PATH)
+	message(FATAL_ERROR "NBL_TARGET_PATH variable must be specified for this script!")
+endif()
+
+cmake_path(GET NBL_TARGET_PATH FILENAME NBL_TARGET_NAME)
+
+set(NBL_INPUT_MSVC_CONFIG_FILE ${NBL_ROOT_PATH}/cmake/config/msvc/application.exe.config)
+
+file(RELATIVE_PATH NBL_DLL_RELATIVE_PATH "${NBL_GEN_DIRECTORY}" "${NBL_DLL_PATH}")
+cmake_path(GET NBL_DLL_RELATIVE_PATH PARENT_PATH NBL_ASSEMLBY_RELATIVE_PATH)
+cmake_path(GET NBL_ASSEMLBY_RELATIVE_PATH PARENT_PATH NBL_ASSEMLBY_RELATIVE_PATH)
+
+message(STATUS "Generating ${NBL_GEN_DIRECTORY}/${NBL_TARGET_NAME}.config")
+configure_file("${NBL_INPUT_MSVC_CONFIG_FILE}" "${NBL_GEN_DIRECTORY}/${NBL_TARGET_NAME}.config")

cmake/scripts/nbl/nablaMSVCManifest.cmake

@@ -0,0 +1,38 @@
+# Copyright (c) 2022 DevSH Graphics Programming Sp. z O.O.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# CMake script for generating msvc manifest during build time
+
+if(DEFINED NBL_ROOT_PATH)
+	if(NOT EXISTS ${NBL_ROOT_PATH})
+		message(FATAL_ERROR  "NBL_ROOT_PATH as '${NBL_ROOT_PATH}' is invalid!")
+	endif()
+else()
+	message(FATAL_ERROR  "NBL_ROOT_PATH variable must be specified for this script!")
+endif()
+
+if(NOT DEFINED NBL_GEN_DIRECTORY)
+	message(FATAL_ERROR "NBL_GEN_DIRECTORY variable must be specified for this script!")
+endif()
+
+if(NOT DEFINED NABLA_DLL_PATH)
+	message(FATAL_ERROR  "NABLA_DLL_PATH variable must be specified for this script!")
+endif()
+
+cmake_path(GET NABLA_DLL_PATH FILENAME NABLA_DLL)
+
+set(NBL_INPUT_MSVC_MANIFEST_FILE ${NBL_ROOT_PATH}/cmake/manifest/msvc/devshgraphicsprogramming.nabla.manifest)
+
+message(STATUS "Generating ${NBL_GEN_DIRECTORY}/devshgraphicsprogramming.nabla.manifest")
+configure_file("${NBL_INPUT_MSVC_MANIFEST_FILE}" "${NBL_GEN_DIRECTORY}")