Merge remote-tracking branch 'upstream/xd_dev' into xd_dev

q4a · q4a · commit 73062e00ea30 · 2018-05-17T05:54:28.000+03:00
diff --git a/src/Layers/xrRender/HOM.cpp b/src/Layers/xrRender/HOM.cpp
@@ -3,6 +3,10 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
+
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+
 #include "HOM.h"
 #include "occRasterizer.h"
 #include "xrEngine/GameFont.h"
@@ -93,26 +97,30 @@ void CHOM::Load()
 
     // Create RASTER-triangles
     m_pTris = xr_alloc<occTri>(u32(CL.getTS()));
-    for (u32 it = 0; it < CL.getTS(); it++)
+
+    tbb::parallel_for(tbb::blocked_range<u32>(0, CL.getTS()), [&](const auto& range)
     {
-        CDB::TRI& clT = CL.getT()[it];
-        occTri& rT = m_pTris[it];
-        Fvector& v0 = CL.getV()[clT.verts[0]];
-        Fvector& v1 = CL.getV()[clT.verts[1]];
-        Fvector& v2 = CL.getV()[clT.verts[2]];
-        rT.adjacent[0] = (0xffffffff == adjacency[3 * it + 0]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 0]);
-        rT.adjacent[1] = (0xffffffff == adjacency[3 * it + 1]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 1]);
-        rT.adjacent[2] = (0xffffffff == adjacency[3 * it + 2]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 2]);
-        rT.flags = clT.dummy;
-        rT.area = Area(v0, v1, v2);
-        if (rT.area < EPS_L)
+        for (u32 it = range.begin(); it != range.end(); ++it)
         {
-            Msg("! Invalid HOM triangle (%f,%f,%f)-(%f,%f,%f)-(%f,%f,%f)", VPUSH(v0), VPUSH(v1), VPUSH(v2));
+            CDB::TRI& clT = CL.getT()[it];
+            occTri& rT = m_pTris[it];
+            Fvector& v0 = CL.getV()[clT.verts[0]];
+            Fvector& v1 = CL.getV()[clT.verts[1]];
+            Fvector& v2 = CL.getV()[clT.verts[2]];
+            rT.adjacent[0] = (0xffffffff == adjacency[3 * it + 0]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 0]);
+            rT.adjacent[1] = (0xffffffff == adjacency[3 * it + 1]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 1]);
+            rT.adjacent[2] = (0xffffffff == adjacency[3 * it + 2]) ? ((occTri*)(-1)) : (m_pTris + adjacency[3 * it + 2]);
+            rT.flags = clT.dummy;
+            rT.area = Area(v0, v1, v2);
+
+            if (rT.area < EPS_L)
+                Msg("! Invalid HOM triangle (%f,%f,%f)-(%f,%f,%f)-(%f,%f,%f)", VPUSH(v0), VPUSH(v1), VPUSH(v2));
+
+            rT.plane.build(v0, v1, v2);
+            rT.skip = 0;
+            rT.center.add(v0, v1).add(v2).div(3.f);
         }
-        rT.plane.build(v0, v1, v2);
-        rT.skip = 0;
-        rT.center.add(v0, v1).add(v2).div(3.f);
-    }
+    });
 
     // Create AABB-tree
     m_pModel = new CDB::MODEL();
diff --git a/src/Layers/xrRender/ModelPool.cpp b/src/Layers/xrRender/ModelPool.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#pragma hdrstop
 
 #include "ModelPool.h"
 
@@ -395,7 +394,7 @@ void CModelPool::Prefetch()
     // prefetch visuals
     string256 section;
     strconcat(sizeof(section), section, "prefetch_visuals_", g_pGamePersistent->m_game_params.m_game_type);
-    CInifile::Sect& sect = pSettings->r_section(section);
+    const CInifile::Sect& sect = pSettings->r_section(section);
     for (auto I = sect.Data.cbegin(); I != sect.Data.cend(); I++)
     {
         const CInifile::Item& item = *I;
diff --git a/src/Layers/xrRender/PSLibrary.cpp b/src/Layers/xrRender/PSLibrary.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#pragma hdrstop
+
 #include "PSLibrary.h"
 #include "ParticleEffect.h"
 #include "ParticleGroup.h"
@@ -8,8 +8,6 @@
 #include "editors/ECore/Editor/ui_main.h"
 #endif
 
-#define _game_data_ "$game_data$"
-
 bool ped_sort_pred(const PS::CPEDef* a, const PS::CPEDef* b) { return xr_strcmp(a->Name(), b->Name()) < 0; }
 bool pgd_sort_pred(const PS::CPGDef* a, const PS::CPGDef* b) { return xr_strcmp(a->m_Name, b->m_Name) < 0; }
 bool ped_find_pred(const PS::CPEDef* a, LPCSTR b) { return xr_strcmp(a->Name(), b) < 0; }
diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp
@@ -348,23 +348,12 @@ void CResourceManager::DeferredUpload()
     if (!RDEVICE.b_is_Ready)
         return;
 
-#ifndef MASTER_GOLD
-    Msg("%s, amount of textures: %d", __FUNCTION__, m_textures.size());
-
-    CTimer timer;
-    timer.Start();
-#endif
-
 #ifndef USE_OGL
     tbb::parallel_for_each(m_textures, [&](auto m_tex) { m_tex.second->Load(); });
 #else
     for (auto& texture : m_textures)
         texture.second->Load();
 #endif
-
-#ifndef MASTER_GOLD
-    Msg("%s, texture loading time: %d ms", __FUNCTION__, timer.GetElapsed_ms());
-#endif
 }
 /*
 void	CResourceManager::DeferredUnload	()
diff --git a/src/Layers/xrRender/ResourceManager_Loader.cpp b/src/Layers/xrRender/ResourceManager_Loader.cpp
@@ -2,7 +2,7 @@
 #pragma hdrstop
 
 #include "ResourceManager.h"
-#include "blenders\blender.h"
+#include "blenders/blender.h"
 
 void CResourceManager::OnDeviceDestroy(BOOL)
 {
diff --git a/src/Layers/xrRender/ResourceManager_Resources.cpp b/src/Layers/xrRender/ResourceManager_Resources.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#pragma hdrstop
+
 
 #pragma warning(push)
 #pragma warning(disable : 4995)
@@ -12,8 +12,8 @@
 
 #include "ResourceManager.h"
 #include "tss.h"
-#include "blenders\blender.h"
-#include "blenders\blender_recorder.h"
+#include "blenders/blender.h"
+#include "blenders/blender_recorder.h"
 
 void fix_texture_name(LPSTR fn);
 
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp
@@ -147,6 +147,16 @@ void CRender::reset_end()
 void CRender::OnFrame()
 {
     Models->DeleteQueue();
+
+    if (ps_r2_ls_flags.test(R2FLAG_EXP_MT_CALC))
+    {
+        // MT-details (@front)
+        Device.seqParallel.insert(
+            Device.seqParallel.begin(), fastdelegate::FastDelegate0<>(Details, &CDetailManager::MT_CALC));
+
+        // MT-HOM (@front)
+        Device.seqParallel.insert(Device.seqParallel.begin(), fastdelegate::FastDelegate0<>(&HOM, &CHOM::MT_RENDER));
+    }
 }
 
 // Перед началом рендера мира --#SM+#-- +SecondVP+
@@ -426,8 +436,11 @@ void CRender::Calculate()
     // Frustum & HOM rendering
     ViewBase.CreateFromMatrix(Device.mFullTransform, FRUSTUM_P_LRTB | FRUSTUM_P_FAR);
     View = nullptr;
-    HOM.Enable();
-    HOM.Render(ViewBase);
+    if (!ps_r2_ls_flags.test(R2FLAG_EXP_MT_CALC))
+    {
+        HOM.Enable();
+        HOM.Render(ViewBase);
+    }
     gm_SetNearer(FALSE);
     phase = PHASE_NORMAL;
 
@@ -469,7 +482,7 @@ void CRender::Calculate()
         PortalTraverser.traverse(pLastSector, ViewBase, Device.vCameraPosition, Device.mFullTransform,
             CPortalTraverser::VQ_HOM + CPortalTraverser::VQ_SSA + CPortalTraverser::VQ_FADE);
 
-        // Determine visibility for static geometry hierrarhy
+        // Determine visibility for static geometry hierarchy
         if (psDeviceFlags.test(rsDrawStatic))
         {
             for (u32 s_it = 0; s_it < PortalTraverser.r_sectors.size(); s_it++)
@@ -597,7 +610,7 @@ void CRender::Calculate()
             }
         }
 
-        // Calculate miscelaneous stuff
+        // Calculate miscellaneous stuff
         BasicStats.ShadowsCalc.Begin();
         L_Shadows->calculate();
         BasicStats.ShadowsCalc.End();
@@ -645,7 +658,7 @@ void CRender::Render()
     r_pmask(true, false); // disable priority "1"
     o.vis_intersect = TRUE;
     HOM.Disable();
-    L_Dynamic->render(0); // addititional light sources
+    L_Dynamic->render(0); // additional light sources
     if (Wallmarks)
     {
         g_r = 0;
@@ -661,7 +674,7 @@ void CRender::Render()
     BasicStats.ShadowsRender.End();
     r_dsgraph_render_lods(false, true); // lods - FB
     r_dsgraph_render_graph(1); // normal level, secondary priority
-    L_Dynamic->render(1); // addititional light sources, secondary priority
+    L_Dynamic->render(1); // additional light sources, secondary priority
     PortalTraverser.fade_render(); // faded-portals
     r_dsgraph_render_sorted(); // strict-sorted geoms
     BasicStats.Glows.Begin();
diff --git a/src/xrEngine/IGame_Persistent.cpp b/src/xrEngine/IGame_Persistent.cpp
@@ -138,21 +138,23 @@ void IGame_Persistent::OnGameStart()
 void IGame_Persistent::Prefetch()
 {
     // prefetch game objects & models
-    float p_time = 1000.f * Device.GetTimerGlobal()->GetElapsed_sec();
-    u32 mem_0 = Memory.mem_usage();
+    CTimer timer;
+    timer.Start();
+    const auto memoryBefore = Memory.mem_usage();
 
     Log("Loading objects...");
     ObjectPool.prefetch();
+
     Log("Loading models...");
     GEnv.Render->models_Prefetch();
+
     Log("Loading textures...");
     GEnv.Render->ResourcesDeferredUpload();
 
-    p_time = 1000.f * Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
-    u32 p_mem = Memory.mem_usage() - mem_0;
+    const auto memoryAfter = Memory.mem_usage() - memoryBefore;
 
-    Msg("* [prefetch] time:   %d ms", iFloor(p_time));
-    Msg("* [prefetch] memory: %dKb", p_mem / 1024);
+    Msg("* [prefetch] time:   %d ms", timer.GetElapsed_ms());
+    Msg("* [prefetch] memory: %d Kb", memoryAfter / 1024);
 }
 #endif
 
diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
@@ -13,9 +13,9 @@
 
 #include "xrCore/FTimer.h"
 #include "Stats.h"
+#include "xrCommon/xr_list.h"
 #include "xrCore/Threading/Event.hpp"
 #include "xrCore/fastdelegate.h"
-#include "xrCommon/xr_list.h"
 #include "xrCore/ModuleLookup.hpp"
 
 #define VIEWPORT_NEAR 0.2f
@@ -26,7 +26,6 @@
 #include "Include/xrRender/FactoryPtr.h"
 #include "Render.h"
 
-
 class engine_impl;
 
 #pragma pack(push, 4)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#pragma hdrstop`
`3`	`3`
`4`	`4`	`#include "ResourceManager.h"`
`5`		`-#include "blenders\blender.h"`
	`5`	`+#include "blenders/blender.h"`
`6`	`6`
`7`	`7`	`void CResourceManager::OnDeviceDestroy(BOOL)`
`8`	`8`	`{`