From 5c9c34377eb8bfa39e65dcb46cd24f5ca660ca70 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Wed, 13 Jan 2016 17:53:15 -0800
Subject: [PATCH] Move GL context sync to render Engine (from Task)

---
 libraries/render-utils/src/RenderDeferredTask.cpp | 2 --
 libraries/render/src/render/Engine.cpp            | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index b9dfa3e3ec..37126e6558 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -186,8 +186,6 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend
     setToneMappingExposure(renderContext->getTone().exposure);
     setToneMappingToneCurve(renderContext->getTone().toneCurve);
 
-    renderContext->getArgs()->_context->syncCache();
-
     for (auto job : _jobs) {
         job.run(sceneContext, renderContext);
     }
diff --git a/libraries/render/src/render/Engine.cpp b/libraries/render/src/render/Engine.cpp
index aa5816475a..06cfd2e78b 100644
--- a/libraries/render/src/render/Engine.cpp
+++ b/libraries/render/src/render/Engine.cpp
@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <gpu/Context.h>
+
 #include "Engine.h"
 
 using namespace render;
@@ -34,7 +36,9 @@ void Engine::addTask(const TaskPointer& task) {
 }
 
 void Engine::run() {
-    // TODO: Tasks will need to be specified such that their data can feed into each other
+    // Sync GPU state before beginning to render
+    _renderContext->getArgs()->_context->syncCache();
+
     for (auto task : _tasks) {
         task->run(_sceneContext, _renderContext);
     }