Refactor implementation constants.
Bug 19353282
Change-Id: If2eb9f2d78c3a44b720bb1f223711411b576d710
Reviewed-on: https://swiftshader-review.googlesource.com/5140
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/Main/Config.cpp b/src/Main/Config.cpp
index 10928ba..becea9c 100644
--- a/src/Main/Config.cpp
+++ b/src/Main/Config.cpp
@@ -14,63 +14,66 @@
#include "Thread.hpp"
#include "Timer.hpp"
-Profiler profiler;
-
-Profiler::Profiler()
+namespace sw
{
- reset();
-}
+ Profiler profiler;
-void Profiler::reset()
-{
- framesSec = 0;
- framesTotal = 0;
- FPS = 0;
-
- #if PERF_PROFILE
- for(int i = 0; i < PERF_TIMERS; i++)
- {
- cycles[i] = 0;
- }
-
- ropOperations = 0;
- ropOperationsTotal = 0;
- ropOperationsFrame = 0;
-
- texOperations = 0;
- texOperationsTotal = 0;
- texOperationsFrame = 0;
-
- compressedTex = 0;
- compressedTexTotal = 0;
- compressedTexFrame = 0;
- #endif
-};
-
-void Profiler::nextFrame()
-{
- #if PERF_PROFILE
- ropOperationsFrame = sw::atomicExchange(&ropOperations, 0);
- texOperationsFrame = sw::atomicExchange(&texOperations, 0);
- compressedTexFrame = sw::atomicExchange(&compressedTex, 0);
-
- ropOperationsTotal += ropOperationsFrame;
- texOperationsTotal += texOperationsFrame;
- compressedTexTotal += compressedTexFrame;
- #endif
-
- static double fpsTime = sw::Timer::seconds();
-
- double time = sw::Timer::seconds();
- double delta = time - fpsTime;
- framesSec++;
-
- if(delta > 1.0)
+ Profiler::Profiler()
{
- FPS = framesSec / delta;
-
- fpsTime = time;
- framesTotal += framesSec;
- framesSec = 0;
+ reset();
}
-}
+
+ void Profiler::reset()
+ {
+ framesSec = 0;
+ framesTotal = 0;
+ FPS = 0;
+
+ #if PERF_PROFILE
+ for(int i = 0; i < PERF_TIMERS; i++)
+ {
+ cycles[i] = 0;
+ }
+
+ ropOperations = 0;
+ ropOperationsTotal = 0;
+ ropOperationsFrame = 0;
+
+ texOperations = 0;
+ texOperationsTotal = 0;
+ texOperationsFrame = 0;
+
+ compressedTex = 0;
+ compressedTexTotal = 0;
+ compressedTexFrame = 0;
+ #endif
+ };
+
+ void Profiler::nextFrame()
+ {
+ #if PERF_PROFILE
+ ropOperationsFrame = sw::atomicExchange(&ropOperations, 0);
+ texOperationsFrame = sw::atomicExchange(&texOperations, 0);
+ compressedTexFrame = sw::atomicExchange(&compressedTex, 0);
+
+ ropOperationsTotal += ropOperationsFrame;
+ texOperationsTotal += texOperationsFrame;
+ compressedTexTotal += compressedTexFrame;
+ #endif
+
+ static double fpsTime = sw::Timer::seconds();
+
+ double time = sw::Timer::seconds();
+ double delta = time - fpsTime;
+ framesSec++;
+
+ if(delta > 1.0)
+ {
+ FPS = framesSec / delta;
+
+ fpsTime = time;
+ framesTotal += framesSec;
+ framesSec = 0;
+ }
+ }
+}
\ No newline at end of file
