Address shader compiler review feedback locally

Author: AnastaZIuk

include/nbl/asset/utils/IShaderCompiler.h

@@ -17,9 +17,6 @@
 #include "nbl/builtin/hlsl/enums.hlsl"
 
 #include <functional>
-#include <mutex>
-#include <unordered_map>
-#include <unordered_set>
 
 namespace nbl::asset
 {
@@ -72,9 +69,6 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 
 			protected:
 				core::smart_refctd_ptr<system::ISystem> m_system;
-				mutable std::mutex m_cacheMutex;
-				mutable std::unordered_map<std::string, IIncludeLoader::found_t> m_cache;
-				mutable std::unordered_set<std::string> m_missingCache;
 		};
 
 		class NBL_API2 CIncludeFinder : public core::IReferenceCounted

src/nbl/asset/utils/IShaderCompiler.cpp

@@ -2,7 +2,6 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include "nbl/asset/utils/IShaderCompiler.h"
-#include "includeResolutionCommon.h"
 #include "nbl/asset/utils/shadercUtils.h"
 
 #include <sstream>
@@ -605,49 +604,16 @@ auto IShaderCompiler::CFileSystemIncludeLoader::getInclude(const system::path& s
 {
     system::path path = (searchPath / includeName).lexically_normal();
 
-    const auto cacheKey = path.generic_string();
-    if (!cacheKey.empty())
-    {
-        std::lock_guard<std::mutex> lock(m_cacheMutex);
-        const auto found = m_cache.find(cacheKey);
-        if (found != m_cache.end())
-        {
-            if (needHash && found->second.hash == core::blake3_hash_t{})
-            {
-                core::blake3_hasher hasher;
-                hasher.update(reinterpret_cast<uint8_t*>(found->second.contents.data()), found->second.contents.size() * (sizeof(char) / sizeof(uint8_t)));
-                found->second.hash = static_cast<core::blake3_hash_t>(hasher);
-            }
-            return found->second;
-        }
-        if (m_missingCache.contains(cacheKey))
-            return {};
-    }
-
     core::smart_refctd_ptr<system::IFile> f;
     {
         system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
         m_system->createFile(future, path.c_str(), system::IFile::ECF_READ);
         if (!future.wait())
-        {
-            if (!cacheKey.empty())
-            {
-                std::lock_guard<std::mutex> lock(m_cacheMutex);
-                m_missingCache.insert(cacheKey);
-            }
             return {};
-        }
         future.acquire().move_into(f);
     }
     if (!f)
-    {
-        if (!cacheKey.empty())
-        {
-            std::lock_guard<std::mutex> lock(m_cacheMutex);
-            m_missingCache.insert(cacheKey);
-        }
         return {};
-    }
     const size_t size = f->getSize();
 
     std::string contents(size, '\0');
@@ -664,13 +630,6 @@ auto IShaderCompiler::CFileSystemIncludeLoader::getInclude(const system::path& s
         retVal.hash = static_cast<core::blake3_hash_t>(hasher);
     }
 
-    if (!cacheKey.empty())
-    {
-        std::lock_guard<std::mutex> lock(m_cacheMutex);
-        m_missingCache.erase(cacheKey);
-        m_cache.insert_or_assign(cacheKey, retVal);
-    }
-
     return retVal;
 }
 
@@ -731,22 +690,9 @@ auto IShaderCompiler::CIncludeFinder::getIncludeRelative(const system::path& req
 {
     const auto lookupName = normalizeIncludeLookupName(includeName);
     IShaderCompiler::IIncludeLoader::found_t retVal;
-    if (asset::detail::isGloballyResolvedIncludeName(lookupName))
-    {
-        if (auto contents = tryIncludeGenerators(lookupName))
-            retVal = std::move(contents);
-        else if (auto contents = trySearchPaths(lookupName, needHash))
-            retVal = std::move(contents);
-        else retVal = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), lookupName, needHash);
-    }
-    else
-    {
-        if (auto contents = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), lookupName, needHash))
-            retVal = std::move(contents);
-        else if (auto contents = tryIncludeGenerators(lookupName))
-            retVal = std::move(contents);
-        else retVal = std::move(trySearchPaths(lookupName, needHash));
-    }
+    if (auto contents = m_defaultFileSystemLoader->getInclude(requestingSourceDir.string(), lookupName, needHash))
+        retVal = std::move(contents);
+    else retVal = std::move(trySearchPaths(lookupName, needHash));
 
     if (needHash && retVal && retVal.hash == core::blake3_hash_t{})
     {

src/nbl/asset/utils/includeResolutionCommon.h

@@ -17,7 +17,6 @@
 #include <unordered_set>
 
 #include "nbl/asset/utils/IShaderCompiler.h"
-#include "includeResolutionCommon.h"
 
 namespace nbl::wave
 {
@@ -27,6 +26,30 @@ using namespace boost::wave::util;
 
 namespace detail
 {
+inline bool is_globally_resolved_include_name(std::string_view includeName)
+{
+    constexpr std::string_view globalPrefixes[] = {
+        "nbl/",
+        "nbl\\",
+        "boost/",
+        "boost\\",
+        "glm/",
+        "glm\\",
+        "spirv/",
+        "spirv\\",
+        "Imath/",
+        "Imath\\"
+    };
+
+    for (const auto prefix : globalPrefixes)
+    {
+        if (includeName.rfind(prefix, 0ull) == 0ull)
+            return true;
+    }
+
+    return false;
+}
+
 struct PerfStats
 {
     bool enabled = false;
@@ -740,7 +763,7 @@ class context : private boost::noncopyable
         std::string make_include_resolution_key(std::string_view includeName, bool is_system) const
         {
             std::string key;
-            const bool globallyResolved = is_system || asset::detail::isGloballyResolvedIncludeName(includeName);
+            const bool globallyResolved = is_system || detail::is_globally_resolved_include_name(includeName);
             if (!globallyResolved)
             {
                 const auto currentDirString = current_dir.generic_string();