Merge remote-tracking branch 'OpenXRay/dev' into yohji/feat/remove-SSS

Author: Xottab-DUTY

Externals/imgui

@@ -82,7 +82,11 @@ void CRender::Calculate()
     // Configure
     o.distortion    = o.distortion_enabled;
     o.mt_calculate  = ps_r2_mt_calculate > 0;
+#ifdef USE_DX11
     o.mt_render     = ps_r2_mt_render > 0;
+#else
+    o.mt_render     = 0; // OpenGL does not support parallel draw calls
+#endif
 
     if (m_bFirstFrameAfterReset)
         return;

src/Layers/xrRender_R2/r2_R_calculate.cpp

@@ -197,10 +197,11 @@ TaskManager::~TaskManager()
 void TaskManager::RegisterThisThreadAsWorker()
 {
     ZoneScoped;
+    std::lock_guard guard{ workersLock };
+
     R_ASSERT2(workers.size() < std::thread::hardware_concurrency(),
         "You must change OTHER_THREADS_COUNT if you want to register more custom threads.");
 
-    std::lock_guard guard{ workersLock };
     s_tl_worker.id = workers.size();
     workers.emplace_back(&s_tl_worker);
 }

src/xrCore/Threading/TaskManager.cpp

@@ -217,11 +217,33 @@ XML_NODE XMLDocument::NavigateToNode(CONST_XML_NODE start_node, pcstr path, cons
     buf_str[0] = 0;
     xr_strcpy(buf_str, path);
 
-    const char seps[] = ":";
     size_t tmp = 0;
 
-    //разбить путь на отдельные подпути
-    char* token = strtok(buf_str, seps);
+    char* cursor = buf_str;
+
+    // Thread-safe tokenization over ':'
+    auto next_token = [](char*& cur) -> char*
+    {
+        if (!cur || *cur == '\0')
+            return nullptr;
+
+        char* start = cur;
+        char* sep = strchr(cur, ':');
+        if (sep)
+        {
+            *sep = '\0';
+            cur = sep + 1;
+        }
+        else
+        {
+            cur = nullptr;
+        }
+
+        return start;
+    };
+
+    // разбить путь на отдельные подпути
+    char* token = next_token(cursor);
 
     if (token != nullptr)
     {
@@ -234,7 +256,7 @@ XML_NODE XMLDocument::NavigateToNode(CONST_XML_NODE start_node, pcstr path, cons
     while (token)
     {
         // Get next token:
-        token = strtok(nullptr, seps);
+        token = next_token(cursor);
 
         if (token != nullptr)
             if (node)

src/xrCore/XML/XMLDocument.cpp

@@ -59,17 +59,14 @@ void CStringTable::Init()
     xr_sprintf(files_mask, "text" DELIMITER "%s" DELIMITER "*.xml", pData->m_sLanguage.c_str());
     FS.file_list(fset, "$game_config$", FS_ListFiles, files_mask);
 
-    auto fit = fset.begin();
-    auto fit_e = fset.end();
-
-    for (; fit != fit_e; ++fit)
+    xr_parallel_for_each(fset, [this](const FS_File& it)
     {
         string_path fn, ext;
-        _splitpath(fit->name.c_str(), nullptr, nullptr, fn, ext);
+        _splitpath(it.name.c_str(), nullptr, nullptr, fn, ext);
         xr_strcat(fn, ext);
 
         Load(fn);
-    }
+    });
 
     if (!translate("st_currency", pData->m_sCurrency) &&
         !translate("ui_st_money_descr", pData->m_sCurrency) && // OGSR
@@ -238,7 +235,7 @@ void CStringTable::Load(LPCSTR xml_file_full)
         [[maybe_unused]] bool duplicate{};
         const STRING_VALUE str_val = ParseLine(string_text); // NOLINT
         {
-            //std::lock_guard guard{ pDataMutex };
+            std::lock_guard guard{ pDataMutex };
 #ifndef MASTER_GOLD
             duplicate = pData->m_StringTable.find(string_name) != pData->m_StringTable.end();
 #endif