Merge remote-tracking branch 'origin' into ali_shader_cache

Author: alichraghi

.gitmodules

@@ -102,6 +102,9 @@
 [submodule "3rdparty/imguizmo"]
 	path = 3rdparty/imguizmo
 	url = [email protected]:Devsh-Graphics-Programming/ImGuizmo.git
+[submodule "3rdparty/imgui_test_engine"]
+	path = 3rdparty/imgui_test_engine
+	url = [email protected]:ocornut/imgui_test_engine.git
 [submodule "3rdparty/git-version-tracking"]
 	path = 3rdparty/git-version-tracking
 	url = [email protected]:Devsh-Graphics-Programming/cmake-git-version-tracking.git

.vsconfig

@@ -0,0 +1,24 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.VisualStudio.Component.VC.CoreIde",
+    "Microsoft.VisualStudio.Component.Windows10SDK",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "Microsoft.VisualStudio.Component.Graphics.Tools",
+    "Microsoft.VisualStudio.Component.VC.DiagnosticTools",
+    "Microsoft.VisualStudio.Component.Windows11SDK.22621",
+    "Microsoft.VisualStudio.Component.VC.ATL",
+    "Microsoft.VisualStudio.Component.SecurityIssueAnalysis",
+    "Microsoft.VisualStudio.Component.VC.ATLMFC",
+    "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
+    "Microsoft.VisualStudio.Component.VC.CMake.Project",
+    "Microsoft.VisualStudio.Component.VC.ASAN",
+    "Microsoft.VisualStudio.Workload.NativeDesktop",
+    "Microsoft.Net.ComponentGroup.TargetingPacks.Common"
+  ],
+  "extensions": []
+}

3rdparty/CMakeLists.txt

@@ -180,6 +180,8 @@ option(WITH_JAVA "libjpeg-turbo" OFF)
 set(CMAKE_INSTALL_DOCDIR "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo/install/docdir")
 set(CMAKE_INSTALL_MANDIR "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo/install/mandir")
 add_subdirectory(libjpeg-turbo libjpeg-turbo EXCLUDE_FROM_ALL)
+NBL_TARGET_FORCE_ASSEMBLER_EXECUTABLE(simd ASM_NASM libjpeg-turbo/simd/)
+
 unset(CMAKE_INSTALL_DOCDIR)
 unset(CMAKE_INSTALL_MANDIR)
 
@@ -233,9 +235,6 @@ if(_NBL_COMPILE_WITH_OPEN_EXR_)
 	set(BUILD_TESTING ${_OLD_BUILD_TESTING})
 endif()
 
-
-
-
 #gli
 option(_NBL_COMPILE_WITH_GLI_ "Build with GLI library" ON)
 if(_NBL_COMPILE_WITH_GLI_)
@@ -289,54 +288,113 @@ add_library(spirv_cross OBJECT
 target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
 # cmake-git-version-tracking
+# note that checking if a repository is dirty may cost build time (especially a lot if like us you have a lot of submodules) - by default we run with all checks but if you want to increase build time iterations I recommend to exclude this check
+option(GIT_EXCLUDE_IS_DIRTY "Exclude IS_DIRTY from git tracking checks, will increase build time iterations at the expense of the meta information loss" OFF)
 add_subdirectory(git-version-tracking EXCLUDE_FROM_ALL)
 NBL_ADD_GIT_TRACKING_META_LIBRARY(nabla "${NBL_ROOT_PATH}")
 NBL_ADD_GIT_TRACKING_META_LIBRARY(dxc "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc")
 NBL_GENERATE_GIT_TRACKING_META()
 
 if(NBL_BUILD_IMGUI)
+	set(NBL_IMGUI_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/imgui")
+	set(NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT "${THIRD_PARTY_SOURCE_DIR}/imgui_test_engine")
+	set(NBL_IMGUI_TEST_ENGINE_ROOT "${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}/imgui_test_engine")
+	set(NBL_IMGUI_TEST_SUITE_ROOT "${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}/imgui_test_suite")
+	set(NBL_IMPLOT_ROOT "${NBL_IMGUI_TEST_SUITE_ROOT}/thirdparty/implot")
+
 	add_library(imgui STATIC
-		"imgui/imconfig.h"
-		"imgui/imgui_demo.cpp"
-		"imgui/imgui_draw.cpp"
-		"imgui/imgui_internal.h"
-		"imgui/imgui_tables.cpp"
-		"imgui/imgui_widgets.cpp"
-		"imgui/imgui.cpp"
-		"imgui/imgui.h"
-		"imgui/misc/cpp/imgui_stdlib.cpp"
-		"imgui/misc/cpp/imgui_stdlib.h"
-		"imgui/imstb_rectpack.h"
-		"imgui/imstb_textedit.h"
-		"imgui/imstb_truetype.h"
+		"${NBL_IMGUI_ROOT}/imconfig.h"
+		"${NBL_IMGUI_ROOT}/imgui_demo.cpp"
+		"${NBL_IMGUI_ROOT}/imgui_draw.cpp"
+		"${NBL_IMGUI_ROOT}/imgui_internal.h"
+		"${NBL_IMGUI_ROOT}/imgui_tables.cpp"
+		"${NBL_IMGUI_ROOT}/imgui_widgets.cpp"
+		"${NBL_IMGUI_ROOT}/imgui.cpp"
+		"${NBL_IMGUI_ROOT}/misc/freetype/imgui_freetype.cpp"
+		"${NBL_IMGUI_ROOT}/imgui.h"
+		"${NBL_IMGUI_ROOT}/misc/cpp/imgui_stdlib.cpp"
+		"${NBL_IMGUI_ROOT}/misc/cpp/imgui_stdlib.h"
+		"${NBL_IMGUI_ROOT}/imstb_rectpack.h"
+		"${NBL_IMGUI_ROOT}/imstb_textedit.h"
+		"${NBL_IMGUI_ROOT}/imstb_truetype.h"
 	)
-	target_include_directories(imgui
-		PUBLIC "imgui"
-		PUBLIC "imgui/misc/cpp"
-		PUBLIC "imgui/backends"
+	
+	target_link_libraries(imgui PUBLIC freetype)
+	
+	target_include_directories(imgui PUBLIC 
+		"${NBL_IMGUI_ROOT}"
+		"${NBL_IMGUI_ROOT}/misc/cpp"
+		"${NBL_IMGUI_ROOT}/backends"
+		"${NBL_IMGUI_TEST_SUITE_ROOT}"
+		$<TARGET_PROPERTY:freetype,INCLUDE_DIRECTORIES>
 	)
 
-	# ImPlot
 	add_library(implot STATIC
-		"implot/implot.h"
-		"implot/implot_internal.h"
-		"implot/implot.cpp"
-		"implot/implot_items.cpp"
+		"${NBL_IMPLOT_ROOT}/implot.h"
+		"${NBL_IMPLOT_ROOT}/implot_internal.h"
+		"${NBL_IMPLOT_ROOT}/implot.cpp"
+		"${NBL_IMPLOT_ROOT}/implot_items.cpp"
+		"${NBL_IMPLOT_ROOT}/implot_demo.cpp"
 	)
+	
 	target_include_directories(implot
-		PUBLIC "imgui"
+		PUBLIC $<TARGET_PROPERTY:imgui,INCLUDE_DIRECTORIES>
+		PUBLIC "${NBL_IMPLOT_ROOT}"
 	)
+	
 	target_link_libraries(implot PUBLIC imgui)
 	target_compile_definitions(implot PUBLIC IMPLOT_DEBUG IMPLOT_DLL_EXPORT)
-	set_property(TARGET implot PROPERTY CXX_STANDARD 11)
+	set_target_properties(implot PROPERTIES CXX_STANDARD 20)
+	
 	if(MSVC)
 		target_compile_options(implot PRIVATE /MT /W4 /WX /arch:AVX2 /fp:fast /permissive-) 
 	else()
 		target_compile_options(implot PRIVATE -Wall -Wextra -pedantic -Werror -mavx2 -Ofast)
 	endif()
+
+	file(GLOB_RECURSE NBL_TEST_SUITE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_SUITE_ROOT}/imgui_test*.cpp")
+	file(GLOB_RECURSE NBL_TEST_SUITE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_SUITE_ROOT}/imgui_test*.cpp")
+
+	add_library(imtestsuite STATIC
+		${NBL_TEST_SUITE_SOURCES}
+	)
+	
+	target_include_directories(imtestsuite PUBLIC
+		"${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}"
+		"${NBL_IMGUI_TEST_ENGINE_ROOT}"
+		"${NBL_IMGUI_TEST_SUITE_ROOT}"
+		$<TARGET_PROPERTY:imgui,INCLUDE_DIRECTORIES>
+		$<TARGET_PROPERTY:implot,INCLUDE_DIRECTORIES>
+	)
+	
+	set_target_properties(imtestsuite PROPERTIES CXX_STANDARD 14) # NOTE! THOSE TESTS DO NOT COMPILE WITH HIGHER STANDARDS SO WE WRAP SOURCES INTO LIBRARY COMPILED WITH LOWER ONE
+	target_link_libraries(imtestsuite PUBLIC implot)
+	
+	file(GLOB_RECURSE NBL_TEST_ENGINE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_ENGINE_ROOT}/*.cpp")
+	
+	add_library(imtestengine STATIC
+		${NBL_TEST_ENGINE_SOURCES}
+	)
+	
+	target_include_directories(imtestengine PUBLIC
+		$<TARGET_PROPERTY:imtestsuite,INCLUDE_DIRECTORIES>
+	)
+	
+	target_link_libraries(imtestengine PUBLIC imtestsuite)
 
 	set(IMGUIZMO_BUILD_EXAMPLE OFF)
 	add_subdirectory(imguizmo EXCLUDE_FROM_ALL)
+
+	# note we override imgui config with our own
+	set(NBL_IMGUI_USER_CONFIG_FILEPATH "${NBL_IMGUI_ROOT}/nabla_imconfig.h")
+
+	if(NOT EXISTS "${NBL_IMGUI_USER_CONFIG_FILEPATH}")
+		message(FATAL_ERROR "\"${NBL_IMGUI_USER_CONFIG_FILEPATH}\" doesn't exist!")
+	endif()
+	
+	target_compile_definitions(imgui PUBLIC
+		IMGUI_USER_CONFIG="${NBL_IMGUI_USER_CONFIG_FILEPATH}"
+	)
 endif()
 
 add_library(aesGladman OBJECT
@@ -427,7 +485,7 @@ if (NBL_BUILD_MITSUBA_LOADER)
 	list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
 if (NBL_BUILD_IMGUI)
-	list(APPEND NBL_3RDPARTY_TARGETS imgui implot imguizmo)
+	list(APPEND NBL_3RDPARTY_TARGETS imgui implot imtestsuite imtestengine imguizmo)
 endif()
 if(ENABLE_HLSL)
 	list(APPEND NBL_3RDPARTY_TARGETS HLSL)

3rdparty/git-version-tracking

@@ -13,7 +13,11 @@ include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
 project(Nabla LANGUAGES CXX C)
-enable_language(C CXX ASM)
+enable_language(C CXX ASM ASM_NASM)
+
+if(MSVC)
+	enable_language(ASM_MASM)
+endif()
 
 option(NBL_STATIC_BUILD "" OFF) # ON for static builds, OFF for shared
 option(NBL_DYNAMIC_MSVC_RUNTIME "" ON)
@@ -30,7 +34,7 @@ endif()
 if(NBL_STATIC_BUILD)
 	message(STATUS "Static Nabla build enabled!")
 else()
-	if(WIN32 AND MSVC)
+	if(MSVC)
 		if(NBL_DYNAMIC_MSVC_RUNTIME)
 			message(STATUS "Shared Nabla build enabled!")
 		else()
@@ -66,6 +70,14 @@ set(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH "${NBL_ROOT_PATH}/include/nbl/builtin")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NBL_ROOT_PATH}/cmake" CACHE PATH "")
 get_property(NBL_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
+include(common)
+
+option(NBL_ENABLE_VS_CONFIG_IMPORT "Request import of .vsconfig file with VS components required to build Nabla" OFF)
+
+if(NBL_ENABLE_VS_CONFIG_IMPORT)
+	NBL_IMPORT_VS_CONFIG()
+endif()
+
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
@@ -189,7 +201,6 @@ get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE
 
 include(submodules/update)
 find_package(Python3 COMPONENTS Interpreter REQUIRED)
-include(common)
 
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 

3rdparty/imgui

@@ -5,7 +5,6 @@
 		"minor": 29,
 		"patch": 2
 	},
-
 	"configurePresets": [
 		{
 			"name": "ci-configure-base",
@@ -109,21 +108,27 @@
 			"inherits": "ci-configure-static-windows-base",
 			"displayName": "[CI]: Static library target, Ninja multi-config generator",
 			"description": "Configure as static library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "ci-configure-dynamic-ninja-multi",
 			"inherits": "ci-configure-dynamic-windows-base",
 			"displayName": "[CI]: Dynamic library target, Ninja multi-config generator",
 			"description": "Configure as dynamic library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-base",
 			"hidden": true,
 			"cacheVariables": {
 				"NBL_CI_MODE": "OFF",
-				"NBL_UPDATE_GIT_SUBMODULE": "ON",
+				"NBL_UPDATE_GIT_SUBMODULE": "OFF",
 				"NBL_RUN_TESTS": "OFF",
 				"NBL_CPACK_CI": "OFF"
 			}
@@ -193,14 +198,20 @@
 			"inherits": "user-configure-static-windows-base",
 			"displayName": "[USER]: Static library target, Ninja multi-config generator",
 			"description": "Configure as static library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-dynamic-ninja-multi",
 			"inherits": "user-configure-dynamic-windows-base",
 			"displayName": "[USER]: Dynamic library target, Ninja multi-config generator",
 			"description": "Configure as dynamic library with Ninja multi-config generator",
-			"generator": "Ninja Multi-Config"
+			"generator": "Ninja Multi-Config",
+			"cacheVariables": {
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+			}
 		},
 		{
 			"name": "user-configure-static-ninja-release",
@@ -209,7 +220,8 @@
 			"description": "Configure as static Release library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
+				"CMAKE_BUILD_TYPE": "Release",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -219,7 +231,8 @@
 			"description": "Configure as dynamic Release library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
+				"CMAKE_BUILD_TYPE": "Release",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -229,7 +242,8 @@
 			"description": "Configure as static RelWithDebInfo library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -239,7 +253,8 @@
 			"description": "Configure as dynamic RelWithDebInfo library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -249,7 +264,8 @@
 			"description": "Configure as static Debug library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
+				"CMAKE_BUILD_TYPE": "Debug",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		},
 		{
@@ -259,7 +275,8 @@
 			"description": "Configure as dynamic Debug library with Ninja single-config generator",
 			"generator": "Ninja",
 			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
+				"CMAKE_BUILD_TYPE": "Debug",
+				"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
 			}
 		}
 	],
@@ -413,7 +430,6 @@
 			"displayName": "[USER]: Dynamic Debug library target, Ninja single-config generator",
 			"description": "Build Nabla as dynamic Debug library with Ninja single-config generator"
 		}
-		
 	],
 	"packagePresets": [
 		{