More data races fixed

src/Renderer/QuadRasterizer.cpp

@@ -49,6 +49,7 @@ namespace sw
 
 		constants = *Pointer<Pointer<Byte>>(data + OFFSET(DrawData,constants));
 		occlusion = 0;
+		int clusterCount = Renderer::getClusterCount();
 
 		Do
 		{
@@ -290,6 +291,8 @@ namespace sw
 				}
 			}
 
+			int clusterCount = Renderer::getClusterCount();
+
 			for(int index = 0; index < RENDERTARGETS; index++)
 			{
 				if(state.colorWriteActive(index))

src/Renderer/Renderer.cpp

@@ -63,8 +63,8 @@ namespace sw
 
 	int batchSize = 128;
 	int threadCount = 1;
-	int unitCount = 1;
-	int clusterCount = 1;
+	AtomicInt Renderer::unitCount = 1;
+	AtomicInt Renderer::clusterCount = 1;
 
 	TranscendentalPrecision logPrecision = ACCURATE;
 	TranscendentalPrecision expPrecision = ACCURATE;

src/Renderer/Renderer.hpp

@@ -39,8 +39,6 @@ namespace sw
 
 	extern int batchSize;
 	extern int threadCount;
-	extern int unitCount;
-	extern int clusterCount;
 
 	enum TranscendentalPrecision
 	{
@@ -405,6 +403,8 @@ namespace sw
 			void resetTimers();
 		#endif
 
+		static int getClusterCount() { return clusterCount; }
+
 	private:
 		static void threadFunction(void *parameters);
 		void threadLoop(int threadIndex);
@@ -468,8 +468,11 @@ namespace sw
 		AtomicInt nextDraw;
 
 		Task taskQueue[32];
-		unsigned int qHead;
-		unsigned int qSize;
+		AtomicInt qHead;
+		AtomicInt qSize;
+
+		static AtomicInt unitCount;
+		static AtomicInt clusterCount;
 
 		MutexLock schedulerMutex;