Merge branch 'master' into fix_rotation_mat

Author: keptsecret

.github/workflows/build-nabla.yml

@@ -345,3 +345,44 @@ jobs:
           
           $token = '${{ secrets.CE_IMAGE_UPDATE_TOKEN }}'
           Invoke-UpdateImages -Token $token
+
+  smoke-tests:
+    name: Nabla / Smoke (${{ matrix.os }}, ${{ matrix.vendor }}-latest, ${{ matrix.config }})
+    needs: build-windows
+    runs-on: windows-2022
+    strategy:
+      fail-fast: false
+      matrix:
+        config: [Release, Debug, RelWithDebInfo]
+        os: [windows-2022]
+        vendor: [msvc]
+    steps:
+      - name: Checkout smoke
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            smoke
+
+      - name: Download Nabla install artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: run-windows-17.13.6-msvc-${{ matrix.config }}-install
+          path: smoke
+
+      - name: Unpack Nabla install artifact
+        run: |
+          $tar = Get-ChildItem smoke -Filter *-install.tar -File | Select-Object -First 1
+          if (-not $tar) { throw "install tar not found in smoke" }
+          tar -xf $tar.FullName -C smoke
+          if (-not (Test-Path "smoke/build-ct/install")) { throw "smoke/build-ct/install not found" }
+          tree.com smoke /F
+
+      - name: Configure Smoke
+        run: cmake -S smoke -B smoke/out
+
+      - name: Build Smoke
+        run: cmake --build smoke/out --config ${{ matrix.config }}
+
+      - name: CTest Smoke
+        run: ctest --test-dir smoke/out --force-new-ctest-process --output-on-failure --no-tests=error -C ${{ matrix.config }}

.gitignore

@@ -16,6 +16,7 @@
 # usually where people build
 android_build/*
 build*/*
+smoke/*build*/*
 # default install paths
 install/*
 # legacy temporary and output directories

3rdparty/CMakeLists.txt

@@ -292,6 +292,9 @@ option(GIT_EXCLUDE_IS_DIRTY "Exclude IS_DIRTY from git tracking checks, will inc
 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_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/nabla_git_info.json")
+nbl_install_file("${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/dxc_git_info.json")
+
 NBL_GENERATE_GIT_TRACKING_META()
 
 # NGFX
@@ -522,7 +525,27 @@ add_dependencies(3rdparty ${NBL_3RDPARTY_TARGETS})
 
 NBL_ADJUST_FOLDERS(3rdaprty)
 
-nbl_install_dir("${CMAKE_CURRENT_SOURCE_DIR}/gtl/include")
+nbl_install_dir(Vulkan-Headers/include/vulkan)
+nbl_install_dir(Vulkan-Headers/include/vk_video)
+
+nbl_install_file_spec(volk/volk.h volk)
+
+nbl_install_dir(gtl/include/gtl)
+nbl_install_dir(glm/glm)
+
+nbl_install_file_spec(${CMAKE_CURRENT_BINARY_DIR}/imath/config/ImathConfig.h imath)
+nbl_install_dir(imath/src/Imath)
+
+nbl_install_file(blake/c/blake3.h)
+
+nbl_install_file_spec(nlohmann_json/include/nlohmann/json_fwd.hpp nlohmann)
+nbl_install_file_spec(nlohmann_json/include/nlohmann/detail/abi_macros.hpp nlohmann/detail)
+
+nbl_install_dir(boost/superproject/libs/preprocessor/include/boost)
+
+nbl_install_file_spec(renderdoc/renderdoc_app.h renderdoc)
+
+nbl_install_file(${CMAKE_CURRENT_BINARY_DIR}/git-version-tracking/git_info.h)
 
 # parent scope exports, must be at the end of the file
 set(_NBL_3RDPARTY_TARGETS_ 

3rdparty/git-version-tracking

@@ -25,12 +25,18 @@ set(NBL_BUILD_ANDROID OFF)
 include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
 
-project(Nabla LANGUAGES CXX C)
+project(Nabla
+	VERSION 0.7.2.0 
+	HOMEPAGE_URL "https://www.devsh.eu/nabla"
+	LANGUAGES CXX C
+)
 enable_language(C CXX ASM ASM_NASM)
 
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
 if(MSVC)
 	enable_language(ASM_MASM)
-	link_libraries(delayimp)
 endif()
 
 # TODO: TO BE KILLED, keep both in one tree
@@ -154,31 +160,16 @@ if(_NBL_AVAILABLE_PHYSICAL_MEMORY_ LESS_EQUAL _NBL_DEBUG_MEMORY_CONSUPTION_WITH_
 	else()
 		set(_NBL_CMAKE_STATUS_ FATAL_ERROR)
 	endif()
-	
+
 	message(${_NBL_CMAKE_STATUS_} "Memory consumption issue detected! To protect you from compile and linker errors, please read this message.\n\nYour total physical memory is ${_NBL_TOTAL_PHYSICAL_MEMORY_} MBs, your OS is currently using ${_NBL_CURRENTLY_USED_PHYSICAL_MEMORY_} MBs and consumption of your memory with requested ${_NBL_JOBS_AMOUNT_} jobs in Debug configuration may be around ${_NBL_DEBUG_MEMORY_CONSUPTION_WITH_ALL_JOBS_} MBs. Please override '_NBL_JOBS_AMOUNT_' variable by setting it as cache variable and lower the jobs! If you want to continue anyway, please define 'NBL_MEMORY_CONSUMPTION_CHECK_SKIP' but be aware - you are doing it on your own risk of possible build failures.")
 endif()
 
 include(adjust/flags)
 include(adjust/definitions)
 
-if(WIN32)
-	set(_NBL_PLATFORM_WINDOWS_ 1)
-elseif(ANDROID)
-	set(_NBL_PLATFORM_ANDROID_ 1)
-elseif(UNIX)
-	set(_NBL_PLATFORM_LINUX_ 1)
-	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()
-
 option(NBL_BUILD_DPL "Enable DPL (Dynamic Parallelism Library)" OFF)
 option(NBL_PCH "Enable pre-compiled header" ON)
-option(NBL_FAST_MATH "Enable fast low-precision math" ON)
+option(NBL_FAST_MATH "Enable fast low-precision math" OFF) # the reason OFF is by default now is the var controling it at build time was set AFTER BuildConfigOptions was generated - resulting in the feature being always OFF regardless the value xD - so just for sanity, keeping the same behaviour by default
 option(NBL_BUILD_EXAMPLES "Enable building examples" ON)
 option(NBL_BUILD_MITSUBA_LOADER "Enable nbl::ext::MitsubaLoader?" OFF) # TODO: once it compies turn this ON by default!
 option(NBL_BUILD_IMGUI "Enable nbl::ext::ImGui?" ON)
@@ -286,4 +277,43 @@ option(NBL_CPACK_INCLUDE_EXAMPLES "CPack with examples and media" ON)
 include(cpack/package)
 include(build/info)
 export(TARGETS ${_NBL_3RDPARTY_TARGETS_} Nabla NAMESPACE Nabla:: APPEND FILE ${NBL_ROOT_PATH_BINARY}/NablaExport.cmake)
-NBL_ADJUST_FOLDERS(nabla)
+
+option(NBL_ENABLE_CONFIG_INSTALL "Install Relocatable NablaConfig.cmake and NablaConfigVersion.cmake scripts" ON)
+
+if(NBL_ENABLE_CONFIG_INSTALL)
+	if(NBL_STATIC_BUILD)
+		message(WARNING "Ignoring NBL_ENABLE_CONFIG_INSTALL due to: TODO, static builds are not relocatable yet!")
+	else()
+		install(TARGETS Nabla
+			EXPORT NablaExportTargets
+			ARCHIVE  DESTINATION ${_NBL_CPACK_PACKAGE_RELATIVE_ENTRY_}/lib
+			LIBRARY  DESTINATION ${_NBL_CPACK_PACKAGE_RELATIVE_ENTRY_}/lib
+			RUNTIME  DESTINATION ${_NBL_CPACK_PACKAGE_RELATIVE_ENTRY_}/runtime/nbl
+		)
+
+		write_basic_package_version_file(
+			"${CMAKE_CURRENT_BINARY_DIR}/NablaConfigVersion.cmake"
+			VERSION ${PROJECT_VERSION}
+			COMPATIBILITY SameMinorVersion
+		)
+
+		configure_package_config_file(
+			"${CMAKE_CURRENT_LIST_DIR}/cmake/NablaConfig.cmake.in"
+			"${CMAKE_CURRENT_BINARY_DIR}/NablaConfig.cmake"
+			INSTALL_DESTINATION cmake
+		)
+
+		install(EXPORT NablaExportTargets
+			NAMESPACE Nabla::
+			DESTINATION cmake
+		)
+
+		install(FILES
+			"${CMAKE_CURRENT_BINARY_DIR}/NablaConfig.cmake"
+			"${CMAKE_CURRENT_BINARY_DIR}/NablaConfigVersion.cmake"
+			DESTINATION cmake
+		)
+	endif()
+endif()
+
+NBL_ADJUST_FOLDERS(nabla)

CMakeLists.txt

@@ -0,0 +1,32 @@
+@PACKAGE_INIT@
+
+set(Nabla_ROOT "${PACKAGE_PREFIX_DIR}")
+set(Nabla_GIT_INFO_JSON_FILE "${PACKAGE_PREFIX_DIR}/include/nabla_git_info.json")
+set(Nabla_DXC_GIT_INFO_JSON_FILE "${PACKAGE_PREFIX_DIR}/include/dxc_git_info.json")
+
+if(NOT EXISTS "${Nabla_GIT_INFO_JSON_FILE}")
+    message(FATAL_ERROR "Nabla: Git info JSON not found at \"${Nabla_GIT_INFO_JSON_FILE}\"")
+endif()
+
+if(NOT EXISTS "${Nabla_DXC_GIT_INFO_JSON_FILE}")
+    message(FATAL_ERROR "Nabla: DXC Git info JSON not found at \"${Nabla_DXC_GIT_INFO_JSON_FILE}\"")
+endif()
+
+include("${CMAKE_CURRENT_LIST_DIR}/NablaExportTargets.cmake")
+check_required_components(Nabla)
+
+if(NABLA_FIND_PACKAGE_VERBOSE)
+  message(STATUS
+    "\n-- Nabla_ROOT = ${Nabla_ROOT}"
+    "\n-- Nabla_VERSION = ${Nabla_VERSION}"
+  )
+
+  file(READ "${Nabla_GIT_INFO_JSON_FILE}" _nabla_git_info_raw)
+  file(READ "${Nabla_DXC_GIT_INFO_JSON_FILE}" _nabla_dxc_git_info_raw)
+  message(STATUS
+    "-- Nabla module git info:"
+    "\n${_nabla_git_info_raw}"
+    "-- Nabla's DXC module git info:"
+    "\n${_nabla_dxc_git_info_raw}"
+  )
+endif()