fix compilation errors && add jit include loader to default include finders

Author: atkurtul

include/nbl/asset/utils/CJITIncludeLoader.h

@@ -11,7 +11,7 @@
 namespace nbl::video
 {
 
-class NBL_API2 CJITIncludeLoader : public IShaderCompiler::IIncludeLoader
+class NBL_API2 CJITIncludeLoader : public asset::IShaderCompiler::IIncludeLoader
 {
 public:
     CJITIncludeLoader(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features);

include/nbl/video/ILogicalDevice.h

@@ -4,6 +4,7 @@
 #include "nbl/asset/asset.h"
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
 #include "nbl/asset/utils/CCompilerSet.h"
+#include "nbl/asset/utils/CJITIncludeLoader.h"
 
 #include "nbl/video/IGPUFence.h"
 /*
@@ -509,8 +510,12 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
                 (*m_offsets)[qci.familyIndex + 1u] = qci.count;
             }
             std::inclusive_scan(m_offsets->begin(),m_offsets->end(),m_offsets->begin());
+
+            addJITIncludeLoader();
         }
 
+        void addJITIncludeLoader();
+
         // must be called by implementations of mapMemory()
         static void post_mapMemory(IDeviceMemoryAllocation* memory, void* ptr, IDeviceMemoryAllocation::MemoryRange rng, core::bitflag<IDeviceMemoryAllocation::E_MAPPING_CPU_ACCESS_FLAGS> access) 
         {

src/nbl/CMakeLists.txt

@@ -195,10 +195,11 @@ set(NBL_ASSET_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CHLSLCompiler.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CCompilerSet.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/utils/CSPIRVIntrospector.cpp
+	${NBL_ROOT_PATH}/src/nbl/asset/utils/CJITIncludeLoader.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/interchange/CGLSLLoader.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/interchange/CHLSLLoader.cpp
 	${NBL_ROOT_PATH}/src/nbl/asset/interchange/CSPVLoader.cpp
-	
+
 # Pipeline loaders
 	${NBL_ROOT_PATH}/src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp
 

src/nbl/asset/utils/CJITIncludeLoader.cpp

@@ -1,6 +1,7 @@
+#include "nbl/asset/utils/CJITIncludeLoader.h"
 
-#include "CJITIncludeLoader.h"
-
+namespace nbl::video
+{
 
 CJITIncludeLoader::CJITIncludeLoader(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features)
 {
@@ -53,3 +54,5 @@ std::string CJITIncludeLoader::collectDeviceCaps(const SPhysicalDeviceLimits& li
         #endif  // _NBL_BUILTIN_HLSL_JIT_DEVICE_CAPABILITIES_INCLUDED_
     )===";
 }
+
+}

src/nbl/video/ILogicalDevice.cpp

@@ -6,6 +6,17 @@ using namespace nbl::video;
 
 E_API_TYPE ILogicalDevice::getAPIType() const { return m_physicalDevice->getAPIType(); }
 
+void ILogicalDevice::addJITIncludeLoader()
+{
+    if(auto cc = (m_physicalDevice && m_compilerSet) ? m_compilerSet->getShaderCompiler(asset::IShader::E_CONTENT_TYPE::ECT_HLSL) : nullptr)
+    {
+        if(auto finder = cc->getDefaultIncludeFinder())
+        {
+            finder->addSearchPath("", core::make_smart_refctd_ptr<CJITIncludeLoader>(m_physicalDevice->getLimits(), m_physicalDevice->getFeatures()));
+        }
+    }
+}
+
 core::smart_refctd_ptr<IGPUDescriptorSetLayout> ILogicalDevice::createDescriptorSetLayout(const IGPUDescriptorSetLayout::SBinding* _begin, const IGPUDescriptorSetLayout::SBinding* _end)
 {
     uint32_t dynamicSSBOCount=0u,dynamicUBOCount=0u;