From cfa51ae1f53bfcda1f52d8e600f7ff823c7439db Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Sun, 17 Jul 2016 18:32:43 -0700
Subject: [PATCH] REmoving problematic timers for mac

---
 libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp    | 4 ++++
 libraries/render-utils/src/RenderDeferredTask.cpp | 4 ++--
 scripts/developer/utilities/render/statsGPU.qml   | 6 ------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp b/libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp
index 09556d8e60..463cff9a6c 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLBackendQuery.cpp
@@ -15,7 +15,11 @@ using namespace gpu;
 using namespace gpu::gl;
 
 // Eventually, we want to test with TIME_ELAPSED instead of TIMESTAMP
+#ifdef Q_OS_MAC
+static bool timeElapsed = true;
+#else
 static bool timeElapsed = false;
+#endif
 
 void GLBackend::do_beginQuery(Batch& batch, size_t paramOffset) {
     auto query = batch._queries.get(batch._params[paramOffset]._uint);
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index d54cc4f7ce..76e5f56714 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -100,7 +100,7 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
     // GPU jobs: Start preparing the primary, deferred and lighting buffer
     const auto primaryFramebuffer = addJob<PreparePrimaryFramebuffer>("PreparePrimaryBuffer");
 
-    const auto fullFrameRangeTimer = addJob<BeginGPURangeTimer>("BeginRangeTimer");
+   // const auto fullFrameRangeTimer = addJob<BeginGPURangeTimer>("BeginRangeTimer");
     const auto opaqueRangeTimer = addJob<BeginGPURangeTimer>("BeginOpaqueRangeTimer");
 
     const auto prepareDeferredInputs = PrepareDeferred::Inputs(primaryFramebuffer, lightingModel).hasVarying();
@@ -209,7 +209,7 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
     // Blit!
     addJob<Blit>("Blit", primaryFramebuffer);
 
-    addJob<EndGPURangeTimer>("RangeTimer", fullFrameRangeTimer);
+ //   addJob<EndGPURangeTimer>("RangeTimer", fullFrameRangeTimer);
 
 }
 
diff --git a/scripts/developer/utilities/render/statsGPU.qml b/scripts/developer/utilities/render/statsGPU.qml
index 03a17d93a6..44ea4c4597 100644
--- a/scripts/developer/utilities/render/statsGPU.qml
+++ b/scripts/developer/utilities/render/statsGPU.qml
@@ -72,12 +72,6 @@ Item {
                    label: "tone and post",
                    color: "#FF0000"
                }
-               ,{
-                   object: Render.getConfig("RangeTimer"),
-                   prop: "gpuTime",
-                   label: "FrameGPU",
-                   color: "#FFFF00"
-               }
            ]
         }
     }