Merge branch 'master' into cad_shaders_work

Author: deprilula28

.gitignore

@@ -13,8 +13,6 @@
 *.ilk
 *.pdb
 *_d.exe
-# CEGUI's downloaded dependencies on Windows
-3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
 # usually where people build
 android_build/*
 build*/*
@@ -23,9 +21,10 @@ install/*
 # legacy temporary and output directories
 lib/*
 doctemp/*
-source/obj
-source/Irrlicht/libIrrlichtServer.a
 # stuff output by examples
 examples_tests/*
 examples_tests/tmp/*
 android-sample/bin/*
+# shader debug sideeffects
+preprocessed.hlsl
+compiled.spv

.gitmodules

@@ -90,6 +90,9 @@
 [submodule "3rdparty/implot"]
 	path = 3rdparty/implot
 	url = git@github.com:Devsh-Graphics-Programming/implot.git
-[submodule "3rdparty/boost/preprocessor"]
-	path = 3rdparty/boost/preprocessor
-	url = git@github.com:Devsh-Graphics-Programming/preprocessor.git
+[submodule "tests"]
+	path = tests
+	url = git@github.com:Devsh-Graphics-Programming/Nabla-Continous-Integration-Python-Framework.git
+[submodule "3rdparty/boost/superproject"]
+	path = 3rdparty/boost/superproject
+	url = git@github.com:boostorg/boost.git

3rdparty/boost/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/preprocessor/include" CACHE PATH "" FORCE)
+set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/superproject/libs/preprocessor/include" CACHE PATH "" FORCE)
 
 get_filename_component(_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_ "${BOOST_PREPROCESSOR_INCLUDE}" ABSOLUTE)
 get_filename_component(_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
@@ -15,4 +15,8 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
 	endforeach()
 
     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()
+endif()
+
+set(BOOST_INCLUDE_LIBRARIES wave)
+set(BOOST_STAGEDIR "${CMAKE_CURRENT_BINARY_DIR}/boost/superproject/stage")
+add_subdirectory(superproject superproject EXCLUDE_FROM_ALL)

3rdparty/boost/preprocessor

@@ -0,0 +1,89 @@
+# How to update the DXC module
+
+## FIRST TIME SETUP: Make sure you have the correct remotes!
+
+The following submodules as initialized on your system should have `origin` pointing at the `git@github.com:Devsh-Graphics-Programming` fork.
+
+Then a remote `Khronos` for the SPIR-V submodules, and `Microsoft` for the DXC.
+
+If they don't then you can correct that with `git remote add [RemoteName] git@github.com:[Organisation]/[Repo-Name].git` and `git remote remove [RemoteName]`
+
+## IF YOU GET `There is no tracking information for the current branch`
+
+just make the branch track the origin
+```
+git branch --set-upstream-to=origin/[BranchName] [BranchName]
+```
+
+## Its Basically an Depth First Search with a Prologue and Epilogue
+
+```
+checkout correct branch HEAD
+[optional] Merge latest stuff from original project
+recurse()
+commit
+push
+```
+
+### First make sure you're on some Nabla branch Head
+
+Just `git pull` and make sure you're tracking a branch.
+
+### Make sure DXC is tracked and pointing at HEAD
+
+```
+cd ./3rdparty/dxc/dxc
+git fetch
+git checkout devshFixes
+git pull
+```
+
+### SPIR-V Headers: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ./external/SPIRV-Headers
+git fetch
+git checkout header_4_hlsl
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### SPIR-V Tools: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ../SPIRV-Tools
+git fetch
+git checkout main
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### Back to DXC and commit the submodule pointer changes
+
+```
+cd ..
+git add .
+git commit -m "Update SPIR-V Headers and Tools"
+cd ..
+[optional] git pull Microsoft main
+[optional] git commit -m "merge upstream from Microsoft"
+git push
+```
+
+The reason the upstream from Microsoft is optional is because it might break our Clang hacks like:
+- abuse of `__decltype`
+- `inout` working like a reference, but only sometimes
+- abuse of reference type
+
+### Finally commit the change of DXC commit pointer to Nabla
+
+```
+cd ..
+git add dxc
+git commit -m "Updated DXC"
+git push
+```

3rdparty/boost/superproject

@@ -1,10 +1,10 @@
 # Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
 # This file is part of the "Nabla Engine".
 # For conditions of distribution and use, see copyright notice in nabla.h.in or nabla.h
+
 cmake_minimum_required(VERSION 3.26)
-#policies
 cmake_policy(SET CMP0112 NEW)
-#
+
 set(NBL_BUILD_ANDROID OFF)
 
 include(ExternalProject)
@@ -55,6 +55,7 @@ endif()
 
 get_filename_component(NBL_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
 get_filename_component(NBL_ROOT_PATH_BINARY "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE)
+get_filename_component(NBL_PYTHON_MODULE_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/tests" ABSOLUTE)
 set(NBL_BUILTIN_RESOURCES_DIRECTORY_PATH "${NBL_ROOT_PATH}/include")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NBL_ROOT_PATH}/cmake" CACHE PATH "")
 
@@ -317,11 +318,15 @@ option(NBL_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
 
 option(NBL_BUILD_DOCS "Enable building documentation?" OFF) # No one has doxygen installed, plus we dont know when was the last time we generated working doxy and we'll use SphinX in the future
 
+option(NBL_ENABLE_PROJECT_JSON_CONFIG_VALIDATION "" ON)
 option(NBL_EMBED_BUILTIN_RESOURCES "Embed built-in resources?" ON)
 
 set(THIRD_PARTY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty")
 set(THIRD_PARTY_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty")
 
+set(NBL_MEDIA_DIRECTORY "${PROJECT_SOURCE_DIR}/examples_tests/media")
+get_filename_component(NBL_MEDIA_DIRECTORY_ABS "${NBL_MEDIA_DIRECTORY}" ABSOLUTE)
+				
 option(NBL_UPDATE_GIT_SUBMODULE "Turn this ON to let CMake update all public submodules for you" ON)
 option(NBL_UPDATE_GIT_SUBMODULE_INCLUDE_PRIVATE "Turn this ON to attempt to update private Nabla submodules" OFF)
 find_package(Git REQUIRED)
@@ -332,6 +337,7 @@ NBL_UPDATE_SUBMODULES()
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
 
 add_subdirectory(src/nbl)
+add_subdirectory("${NBL_PYTHON_MODULE_ROOT_PATH}" tests) # Python Framework
 
 if(NBL_BUILD_EXAMPLES)
 	add_subdirectory(examples_tests)

3rdparty/dxc/Readme.md

@@ -344,6 +344,41 @@ If you want to use git (without a submodule) then you can use `ExternalProject_A
 
 I recommend you use `ExternalProject_Add` instead of `add_subdirectory` for **Nabla** as we haven't  tested its use by *3rdparty* applications that use *CMake* to build themselves yet.
 
+# Continuous integration
+
+## Nabla Python Framework
+
+### CPU & GPU local tests shipped with the repository
+
+#### Description
+
+***Nabla*** aims to implement full CPU & GPU tests used by our CI in-house infrastructure groovy pipelines in relocatable way allowing users to execute and debug the tests locally on their own devices as well. Each test is a Python module which part of it gets created with the CMake build system configuration. A test is defined and created as a module by
+
+- top json configuration file
+- interface Python script
+
+Top json configuration file contains run & build info, array of profiles and json inputs for a Python testing module. The file is processed and validated by CMake to create output profiles bound to the Python module. Single profile contains data used by the module to execute tests with and the implementation of the test is located in interface Python script - the script overrides common abstract interface defined as a integral part of Nabla Python framework module. The description is abstract and doesn't contain specific details, join our discord if you have any questions!
+
+#### Development & Debug
+
+Each valid Python module contains autogenerated .vscode's *launch.json* and *settings.json* to make development easy. You just need to `Open with Code`in the module's directory. Make sure to install [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) there to enable IntelliSense (Pylance), Linting, Debugging (multi-threaded, remote), code formatting, refactoring, unit tests, and more.
+
+A target for which Python module is available for testing lists a special Python Framework section located in its solution's project file structure (**Visual Studio only!**) containing Nabla Python Framework sources, target's interface Python script, autogenerated json profiles and autogenerated` __main__.py` module script. Unfortunately pure Visual Studio works so-so with Python (issues with search module paths defined as `searchPath` .pyproj's property, issues with IntelliSense and Debugging) - we encourage to use Visual Studio Code if you need to Debug an interface or develop it.
+
+#### Runtime
+
+##### Command line
+
+To run all tests bound to a module with a command line you just need to execute `python3 -m <module_reference>`. You can also specify special arguments to have more control over the test execution, for more details see [template module script](https://github.com/Devsh-Graphics-Programming/Nabla-Continous-Integration-Python-Framework/blob/4f7a67a3fa9bb418bcb07fa2f7a5853e55b853c4/scripts/__main__.py.cmake)
+
+##### Visual Studio
+
+You need to open a target's solution. To launch all tests bound to a module a module's `__main__.py` file located in Python Framework section must be selected and `Debug -> Execute File in Python interactive` executed.
+
+**Visual Studio Code**
+
+You need to open module's directory as workspace with `Open with Code `, select `Run and Debug` icon, select `__main__.py` file and run it.
+
 # Caveats and Particular Behaviour
 
 ## Hardcoded Caps