glretrace: Fix cpu timings when not measuring gpu times.

diff --git a/common/trace_profiler.cpp b/common/trace_profiler.cpp
index 773e7cc4096876090087b6c14c3753089e674eda..14edd35477aaac782a9e437a08b0030ccaa58dd3 100644 (file)
--- a/common/trace_profiler.cpp
+++ b/common/trace_profiler.cpp
@@ -120,9 +120,7 @@ void Profiler::addCall(unsigned no,
     }
 
     if (cpuTimes && cpuStart) {
-        double cpuTimeScale = 1.0E9 / os::timeFrequency;
-        cpuStart = (cpuStart - baseCpuTime) * cpuTimeScale;
-        cpuDuration = cpuDuration * cpuTimeScale;
+        cpuStart = cpuStart - baseCpuTime;
 
         if (cpuDuration < minCpuTime) {
             return;

diff --git a/retrace/glretrace_main.cpp b/retrace/glretrace_main.cpp
index 1591287c22d9d254507dba27a23c5245a5e83d20..3645b4f3978cde994afab5da7b86176df15d8687 100755 (executable)
--- a/retrace/glretrace_main.cpp
+++ b/retrace/glretrace_main.cpp
@@ -178,7 +178,9 @@ completeCallQuery(CallQuery& query) {
     }
 
     if (retrace::profilingCpuTimes) {
-        cpuDuration = query.cpuEnd - query.cpuStart;
+        double cpuTimeScale = 1.0E9 / getTimeFrequency();
+        cpuDuration = (query.cpuEnd - query.cpuStart) * cpuTimeScale;
+        query.cpuStart *= cpuTimeScale;
     }
 
     if (retrace::profilingMemoryUsage) {
@@ -318,7 +320,8 @@ initContext() {
     /* Sync the gpu and cpu start times */
     if (retrace::profilingCpuTimes || retrace::profilingGpuTimes) {
         if (!retrace::profiler.hasBaseTimes()) {
-            GLint64 currentTime = getCurrentTime();
+            double cpuTimeScale = 1.0E9 / getTimeFrequency();
+            GLint64 currentTime = getCurrentTime() * cpuTimeScale;
             retrace::profiler.setBaseCpuTime(currentTime);
             retrace::profiler.setBaseGpuTime(currentTime);
         }