Move NUM_THREADS to stdafx.

OpenXRay · Jan 27, 2018 · ff4b7c0 · ff4b7c0
1 parent 62bb2af
commit ff4b7c0
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 14 deletions.
diff --git a/src/utils/xrAI/StdAfx.h b/src/utils/xrAI/StdAfx.h
@@ -13,6 +13,8 @@
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
 
+#define NUM_THREADS 8
+
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;
 extern CThreadManager::ReportStatusFunc ProxyStatus;

diff --git a/src/utils/xrAI/compiler_cover.cpp b/src/utils/xrAI/compiler_cover.cpp
@@ -526,7 +526,6 @@ void compute_non_covers()
     delete_data(nearest);
 }
 
-#define NUM_THREADS 3
 extern void mem_Optimize();
 void xrCover(bool pure_covers)
 {

diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h
@@ -8,6 +8,8 @@
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
 
+#define NUM_THREADS 8
+
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;
 extern CThreadManager::ReportStatusFunc ProxyStatus;

diff --git a/src/utils/xrLC/xrLight.cpp b/src/utils/xrLC/xrLight.cpp
@@ -87,10 +87,9 @@ void CBuild::LMapsLocal()
     // Main process (4 threads)
     Logger.Status("Lighting...");
     CThreadManager threads(ProxyStatus, ProxyProgress);
-    const u32 thNUM = 6;
     CTimer start_time;
     start_time.Start();
-    for (int L = 0; L < thNUM; L++)
+    for (int L = 0; L < NUM_THREADS; L++)
         threads.start(new CLMThread(L));
     threads.wait(500);
     Logger.clMsg("%f seconds", start_time.GetElapsed_sec());

diff --git a/src/utils/xrLC/xrPhase_AdaptiveHT.cpp b/src/utils/xrLC/xrPhase_AdaptiveHT.cpp
@@ -159,8 +159,6 @@ class CPrecalcBaseHemiThread : public CThread
     }
 };
 
-CThreadManager precalc_base_hemi(ProxyStatus, ProxyProgress);
-
 void CBuild::xrPhase_AdaptiveHT()
 {
     CDB::COLLIDER DB;
@@ -205,11 +203,11 @@ void CBuild::xrPhase_AdaptiveHT()
         //	V->C._set			(vC);
         //}
 
+        CThreadManager precalc_base_hemi(ProxyStatus, ProxyProgress);
         u32 stride = u32(-1);
-
         u32 threads = u32(-1);
         u32 rest = u32(-1);
-        get_intervals(8, lc_global_data()->g_vertices().size(), threads, stride, rest);
+        get_intervals(NUM_THREADS, lc_global_data()->g_vertices().size(), threads, stride, rest);
         for (u32 thID = 0; thID < threads; thID++)
             precalc_base_hemi.start(new CPrecalcBaseHemiThread(thID, thID * stride, thID * stride + stride));
         if (rest > 0)

diff --git a/src/utils/xrLC/xrPhase_GI.cpp b/src/utils/xrLC/xrPhase_GI.cpp
@@ -8,7 +8,6 @@
 #include "xrCore/Threading/Lock.hpp"
 #include "xrCDB/xrCDB.h"
 
-#define GI_THREADS 2
 const u32 gi_num_photons = 32;
 const float gi_optimal_range = 15.f;
 const float gi_reflect = 0.9f;
@@ -118,7 +117,7 @@ class CGI : public CThread
                 dst.type = LT_SECONDARY;
                 dst.level++;
                 task_it++;
-                thProgress = float(task_it) / float(task->size()) / float(GI_THREADS);
+                thProgress = float(task_it) / float(task->size()) / float(NUM_THREADS);
             }
             task_cs.Leave();
             if (dst.level > gi_maxlevel)
@@ -227,7 +226,7 @@ void CBuild::xrPhase_Radiosity()
 
     // perform all the work
     u32 setup_old = task->size();
-    for (int t = 0; t < GI_THREADS; t++)
+    for (int t = 0; t < NUM_THREADS; t++)
     {
         gi.start(new CGI(t));
         Sleep(10);

diff --git a/src/utils/xrLC_Light/compiler.cpp b/src/utils/xrLC_Light/compiler.cpp
@@ -6,8 +6,6 @@
 #include "lightthread.h"
 #include "xrLightDoNet.h"
 
-#define NUM_THREADS 3
-
 void xrLight()
 {
     u32 range = gl_data.slots_data.size_z();

diff --git a/src/utils/xrLC_Light/stdafx.h b/src/utils/xrLC_Light/stdafx.h
@@ -10,6 +10,8 @@
 #include "utils/xrLCUtil/ILevelCompilerLogger.hpp"
 #include "utils/xrLCUtil/xrThread.hpp"
 
+#define NUM_THREADS 8
+
 extern ILevelCompilerLogger& Logger;
 extern CThread::LogFunc ProxyMsg;
 extern CThreadManager::ReportStatusFunc ProxyStatus;

diff --git a/src/utils/xrLC_Light/xrLightVertex.cpp b/src/utils/xrLC_Light/xrLightVertex.cpp
@@ -155,7 +155,6 @@ namespace lc_net
 {
 void RunLightVertexNet();
 }
-#define NUM_THREADS 4
 void LightVertex(bool net)
 {
     g_trans = new mapVert();

diff --git a/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp b/src/utils/xrLC_Light/xrLight_ImplicitThread.cpp
@@ -23,7 +23,6 @@ void ImplicitThread::Execute()
     execute.Execute(0);
 }
 
-#define NUM_THREADS 8
 void RunImplicitMultithread(ImplicitDeflector& defl)
 {
     // Start threads