Move CJITIncludeLoader and make it work nicely!

Author: devshgraphicsprogramming

examples_tests

@@ -15,11 +15,15 @@ namespace nbl::video
 class NBL_API2 CJITIncludeLoader : public asset::IShaderCompiler::IIncludeLoader
 {
     public:
-        CJITIncludeLoader(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features);
-        std::optional<std::string> getInclude(const system::path& searchPath, const std::string& includeName) const override;
+        inline CJITIncludeLoader(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features)
+        {
+            m_includes["nbl/builtin/hlsl/jit/device_capabilities.hlsl"] = collectDeviceCaps(limits,features);
+        }
+
+        found_t getInclude(const system::path& searchPath, const std::string& includeName) const override;
 
     private:
-        core::unordered_map<system::path, std::string> m_includes;
+        core::unordered_map<system::path,std::string> m_includes;
         std::string collectDeviceCaps(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features);
 
 };

include/nbl/asset/utils/CJITIncludeLoader.h renamed to include/nbl/video/CJITIncludeLoader.h

@@ -479,34 +479,7 @@ class NBL_API2 ILogicalDevice : public core::IReferenceCounted, public IDeviceMe
         virtual const void* getNativeHandle() const = 0;
 
     protected:
-        ILogicalDevice(core::smart_refctd_ptr<IAPIConnection>&& api, IPhysicalDevice* physicalDevice, const SCreationParams& params)
-            : m_api(api), m_physicalDevice(physicalDevice), m_enabledFeatures(params.featuresToEnable), m_compilerSet(params.compilerSet)
-        {
-            uint32_t qcnt = 0u;
-            uint8_t greatestFamNum = 0u;
-            for (uint32_t i=0u; i<params.queueParamsCount; ++i)
-            {
-                greatestFamNum = (std::max)(greatestFamNum, params.queueParams[i].familyIndex);
-                qcnt += params.queueParams[i].count;
-            }
-
-            m_queues = core::make_refctd_dynamic_array<queues_array_t>(qcnt);
-            m_offsets = core::make_refctd_dynamic_array<q_offsets_array_t>(greatestFamNum + 1u, 0u);
-            
-            for (uint32_t i=0u; i<params.queueParamsCount; ++i)
-            {
-                const auto& qci = params.queueParams[i];
-                if (qci.familyIndex == greatestFamNum)
-                    continue;
-
-                (*m_offsets)[qci.familyIndex + 1u] = qci.count;
-            }
-            std::inclusive_scan(m_offsets->begin(),m_offsets->end(),m_offsets->begin());
-
-            addJITIncludeLoader();
-        }
-
-        void addJITIncludeLoader();
+        ILogicalDevice(core::smart_refctd_ptr<IAPIConnection>&& api, IPhysicalDevice* physicalDevice, const SCreationParams& params);
 
         // 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) 

include/nbl/video/ILogicalDevice.h

@@ -1,28 +1,17 @@
-#include "nbl/asset/utils/CJITIncludeLoader.h"
+#include "nbl/video/CJITIncludeLoader.h"
 
 namespace nbl::video
 {
-
-CJITIncludeLoader::CJITIncludeLoader(const SPhysicalDeviceLimits& limits, const SPhysicalDeviceFeatures& features)
-{
-    m_includes["nbl/builtin/hlsl/jit/device_capabilities.hlsl"] = collectDeviceCaps(limits, features);
-}
-
-std::optional<std::string> CJITIncludeLoader::getInclude(const system::path& searchPath, const std::string& includeName) const
+auto CJITIncludeLoader::getInclude(const system::path& searchPath, const std::string& includeName) const -> found_t
 {
-    system::path path = searchPath / includeName;
-
-    assert(searchPath == "nbl/builtin/hlsl/jit");
+    assert(searchPath=="nbl/builtin/hlsl/jit");
 
     // Look up the content in m_includes map
-    auto it = m_includes.find(path);
-    if (it != m_includes.end())
-    {
-        // Return the content of the specified include file
-        return it->second;
-    }
+    auto it = m_includes.find(includeName);
+    if (it!=m_includes.end())
+        return {includeName,it->second};
 
-    return std::nullopt;
+    return {};
 }
 
 
@@ -54,5 +43,4 @@ std::string CJITIncludeLoader::collectDeviceCaps(const SPhysicalDeviceLimits& li
         #endif  // _NBL_BUILTIN_HLSL_JIT_DEVICE_CAPABILITIES_INCLUDED_
     )===";
 }
-
 }

src/nbl/asset/utils/CJITIncludeLoader.cpp renamed to src/nbl/video/CJITIncludeLoader.cpp

@@ -4,19 +4,36 @@ using namespace nbl;
 using namespace nbl::video;
 
 
-E_API_TYPE ILogicalDevice::getAPIType() const { return m_physicalDevice->getAPIType(); }
-
-void ILogicalDevice::addJITIncludeLoader()
+ILogicalDevice::ILogicalDevice(core::smart_refctd_ptr<IAPIConnection>&& api, IPhysicalDevice* physicalDevice, const SCreationParams& params)
+    : m_api(api), m_physicalDevice(physicalDevice), m_enabledFeatures(params.featuresToEnable), m_compilerSet(params.compilerSet)
 {
-    if(auto cc = (m_physicalDevice && m_compilerSet) ? m_compilerSet->getShaderCompiler(asset::IShader::E_CONTENT_TYPE::ECT_HLSL) : nullptr)
+    uint32_t qcnt = 0u;
+    uint8_t greatestFamNum = 0u;
+    for (uint32_t i=0u; i<params.queueParamsCount; ++i)
     {
-        if(auto finder = cc->getDefaultIncludeFinder())
-        {
-            finder->addSearchPath("nbl/builtin/hlsl/jit", core::make_smart_refctd_ptr<CJITIncludeLoader>(m_physicalDevice->getLimits(), m_physicalDevice->getFeatures()));
-        }
+        greatestFamNum = (std::max)(greatestFamNum, params.queueParams[i].familyIndex);
+        qcnt += params.queueParams[i].count;
     }
+
+    m_queues = core::make_refctd_dynamic_array<queues_array_t>(qcnt);
+    m_offsets = core::make_refctd_dynamic_array<q_offsets_array_t>(greatestFamNum + 1u, 0u);
+            
+    for (uint32_t i=0u; i<params.queueParamsCount; ++i)
+    {
+        const auto& qci = params.queueParams[i];
+        if (qci.familyIndex == greatestFamNum)
+            continue;
+
+        (*m_offsets)[qci.familyIndex + 1u] = qci.count;
+    }
+    std::inclusive_scan(m_offsets->begin(),m_offsets->end(),m_offsets->begin());
+
+    if (auto hlslCompiler = m_compilerSet ? m_compilerSet->getShaderCompiler(asset::IShader::E_CONTENT_TYPE::ECT_HLSL):nullptr)
+        hlslCompiler->getDefaultIncludeFinder()->addSearchPath("nbl/builtin/hlsl/jit",core::make_smart_refctd_ptr<CJITIncludeLoader>(m_physicalDevice->getLimits(),m_physicalDevice->getFeatures()));
 }
 
+E_API_TYPE ILogicalDevice::getAPIType() const { return m_physicalDevice->getAPIType(); }
+
 core::smart_refctd_ptr<IGPUDescriptorSetLayout> ILogicalDevice::createDescriptorSetLayout(const IGPUDescriptorSetLayout::SBinding* _begin, const IGPUDescriptorSetLayout::SBinding* _end)
 {
     uint32_t dynamicSSBOCount=0u,dynamicUBOCount=0u;