Многопоточная загрузка текстур будет вкл/выкл командой r_mt_texload

Author: xrSimpodin

Game/Resources_SoC_1.0006/gamedata/config/text/eng/ui_st_mm.xml

@@ -242,6 +242,9 @@
 	<string id="ui_mm_terrain_parallax">
 		<text>Parallax on terrain</text>
 	</string>	
+	<string id="ui_mm_mt_texload">
+		<text>Multi-threaded texture loading</text>
+	</string>	
 	<string id="ui_mm_dof">
 		<text>Depth of field</text>
 	</string>
@@ -782,7 +785,7 @@
 		<text>Shadow map resolution (r__smap_size)</text>
 	</string>
 	<string id="video_settings_name_60">
-		<text>Ìíîãîïîòî÷íàÿ çàãðóçêà òåêñòóð - rs_mt_texload</text>
+		<text>Multi-threaded texture loading - r_mt_texload</text>
 	</string>
 	<string id="video_settings_name_61">
 		<text>Field of view (fov)</text>

Game/Resources_SoC_1.0006/gamedata/config/text/rus/ui_st_mm.xml

@@ -242,6 +242,9 @@
 	<string id="ui_mm_terrain_parallax">
 		<text>Parallax on terrain</text>
 	</string>	
+	<string id="ui_mm_mt_texload">
+		<text>Ìíîãîïîòî÷íàÿ çàãðóçêà òåêñòóð</text>
+	</string>	
 	<string id="ui_mm_dof">
 		<text>Ãëóáèíà ðåçêîñòè</text>
 	</string>
@@ -782,7 +785,7 @@
 		<text>Ðàçðåøåíèå êàðò òåíåé - r__smap_size</text>
 	</string>
 	<string id="video_settings_name_60">
-		<text>Ìíîãîïîòî÷íàÿ çàãðóçêà òåêñòóð - rs_mt_texload</text>
+		<text>Ìíîãîïîòî÷íàÿ çàãðóçêà òåêñòóð - r_mt_texload</text>
 	</string>
 	<string id="video_settings_name_61">
 		<text>Óãîë îáçîðà - fov</text>

Game/Resources_SoC_1.0006/gamedata/config/ui/ui_mm_opt.xml

@@ -597,6 +597,13 @@
 			<options_item entry="r_terrain_parallax_enable" group="mm_opt_video_adv"/>
 		</check_terrain_parallax>
 
+		<cap_mt_texload x="5" y="5" width="143" height="21">
+			<text font="letterica16" r="215" g="195" b="170">ui_mm_mt_texload</text>
+		</cap_mt_texload>
+		<check_mt_texload x="249" y="0" width="30" height="21">
+			<options_item entry="r_mt_texload" group="mm_opt_video_adv"/>
+		</check_mt_texload>
+
 		<btn_to_simply x="342" y="325" width="111" height="29">
 			<text align="c" font="letterica16" r="227" g="199" b="178">ui_mm_simply</text>
 			<texture>ui_button_ordinary</texture>

Game/Resources_SoC_1.0006/gamedata/scripts/ui_mm_opt_video_adv.script

@@ -80,6 +80,7 @@ local adv_vid_opt_params = {
 	{ "r2_actor_shadow",       "check", 0, hint_colors.green , "video_settings_name_56", "",                       only_2a_and_more_mode },
 	{ "r_sslr_enable",         "check", 1, hint_colors.yellow, "", "",                                             only_4_and_more_mode },
 	{ "3d_scopes_fps_factor",  "track", 0, hint_colors.red   , "video_settings_name_64", "video_settings_desc_64", },
+	{ "mt_texload",            "check", 0, hint_colors.green , "video_settings_name_60", "",                       only_2a_and_more_mode },
 }
 
 local control_init_funs = {

ogsr_engine/Layers/xrRender/ResourceManager.cpp

@@ -371,10 +371,14 @@ void CResourceManager::DeferredUpload()
     if (!RDEVICE.b_is_Ready)
         return;
 
-    Msg("CResourceManager::DeferredUpload MT -> START, size = [%u]", m_textures.size());
+    Msg("CResourceManager::DeferredUpload [%s] -> START, size = [%u]", ps_r2_ls_flags_ext.test(R2FLAGEXT_MT_TEXLOAD) ? "MT" : "NO MT", m_textures.size());
 
     // Теперь многопоточная загрузка текстур даёт очень существенный прирост скорости, проверено.
-    std::for_each(std::execution::par_unseq, m_textures.begin(), m_textures.end(), [](auto& pair) { pair.second->Load(); });
+    if (ps_r2_ls_flags_ext.test(R2FLAGEXT_MT_TEXLOAD))
+        std::for_each(std::execution::par_unseq, m_textures.begin(), m_textures.end(), [](auto& pair) { pair.second->Load(); });
+    else
+        for (auto& pair : m_textures)
+            pair.second->Load();
 
     Msg("CResourceManager::DeferredUpload -> END");
 }

ogsr_engine/Layers/xrRender/xrRender_console.cpp

@@ -135,7 +135,7 @@ Flags32 ps_r2_ls_flags = {R2FLAG_SUN
                           R2FLAG_SUN_FOCUS | R2FLAG_SUN_TSM | R2FLAG_TONEMAP | R2FLAG_VOLUMETRIC_LIGHTS}; // r2-only
 
 Flags32 ps_r2_ls_flags_ext = {
-    /*R2FLAGEXT_SSAO_OPT_DATA |*/ R2FLAGEXT_SSAO_HALF_DATA | R2FLAGEXT_ENABLE_TESSELLATION | R2FLAGEXT_RAIN_DROPS | R2FLAGEXT_RAIN_DROPS_CONTROL
+    /*R2FLAGEXT_SSAO_OPT_DATA |*/ R2FLAGEXT_SSAO_HALF_DATA | R2FLAGEXT_ENABLE_TESSELLATION | R2FLAGEXT_RAIN_DROPS | R2FLAGEXT_RAIN_DROPS_CONTROL | R2FLAGEXT_MT_TEXLOAD
 #if RENDER == R_R4
     | R2FLAGEXT_SSLR
 #endif
@@ -818,6 +818,7 @@ void xrRender_initconsole()
 #endif
 
     CMD3(CCC_Mask, "r_terrain_parallax_enable", &ps_r2_ls_flags_ext, R2FLAGEXT_TERRAIN_PARALLAX);
+    CMD3(CCC_Mask, "r_mt_texload", &ps_r2_ls_flags_ext, R2FLAGEXT_MT_TEXLOAD);
 
     CMD3(CCC_Mask, "r2_sun", &ps_r2_ls_flags, R2FLAG_SUN);
     CMD3(CCC_Mask, "r2_sun_details", &ps_r2_ls_flags, R2FLAG_SUN_DETAILS);

ogsr_engine/Layers/xrRender/xrRender_console.h

@@ -219,6 +219,7 @@ enum
     R2FLAG_VISOR_REFL = 1 << 16,
     R2FLAG_VISOR_REFL_CONTROL = 1 << 17,
     R2FLAGEXT_TERRAIN_PARALLAX = 1 << 18,
+    R2FLAGEXT_MT_TEXLOAD = 1 << 19,
 };
 
 extern void xrRender_initconsole();