Revert "VRAD: Fix thread-sharing bug (#141)"

This reverts commit 0d63ec8.
mastercomfig · Oct 7, 2020 · 4267429 · 4267429
1 parent bcb1cd5
commit 4267429
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/bitmap/float_bm4.cpp b/bitmap/float_bm4.cpp
@@ -20,6 +20,7 @@
 // In order to handle intersections with wrapped copies, we repeat the bitmap triangles this many
 // times
 #define NREPS_TILE 1
+extern int n_intersection_calculations;
 
 
 

diff --git a/raytrace/raytrace.cpp b/raytrace/raytrace.cpp
@@ -233,9 +233,7 @@ void CacheOptimizedTriangle::ChangeIntoIntersectionFormat(void)
 
 }
 
-#if _DEBUG
-std::atomic<int> n_intersection_calculations = 0;
-#endif
+int n_intersection_calculations=0;
 
 int CacheOptimizedTriangle::ClassifyAgainstAxisSplit(int split_plane, float split_value)
 {
@@ -478,10 +476,7 @@ void RayTracingEnvironment::Trace4Rays(const FourRays &rays, fltx4 TMin, fltx4 T
 				TriIntersectData_t const *tri = &( OptimizedTriangleList[tnum].m_Data.m_IntersectData );
 				if ( ( mailboxids[mbox_slot] != tnum ) && ( tri->m_nTriangleID != skip_id ) )
 				{
-					#if _DEBUG
 					n_intersection_calculations++;
-					#endif
-
 					mailboxids[mbox_slot] = tnum;
 					// compute plane intersection