From ab98614dd47887d85f8c204eacbe3e0c617b27a4 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Fri, 1 Jul 2016 14:39:32 -0700
Subject: [PATCH] Fixing the basic to compile the TestWindow

---
 tests/gpu-test/src/TestWindow.cpp | 13 ++++++++++---
 tests/gpu-test/src/TestWindow.h   |  9 +++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/gpu-test/src/TestWindow.cpp b/tests/gpu-test/src/TestWindow.cpp
index 4fe25e989d..c601e8c077 100644
--- a/tests/gpu-test/src/TestWindow.cpp
+++ b/tests/gpu-test/src/TestWindow.cpp
@@ -98,7 +98,8 @@ void TestWindow::beginFrame() {
 
 #ifdef DEFERRED_LIGHTING
     auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
-    deferredLightingEffect->prepare(_renderArgs);
+
+    _prepareDeferred.run(_sceneContext, _renderContext);
 #else
     gpu::doInBatch(_renderArgs->_context, [&](gpu::Batch& batch) {
         batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLORS, { 0.0f, 0.1f, 0.2f, 1.0f });
@@ -128,8 +129,14 @@ void TestWindow::endFrame() {
         batch.setResourceTexture(0, nullptr);
     });
 
-    auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
-    deferredLightingEffect->render(_renderContext);
+    DeferredFrameTransformPointer frameTransform;
+    _generateDeferredFrameTransform.run(_sceneContext, _renderContext, frameTransform);
+
+   // auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
+  //  deferredLightingEffect->render(_renderContext);
+    RenderDeferred::Inputs deferredInputs;
+    deferredInputs.edit0() = frameTransform;
+    _renderDeferred.run(_sceneContext, _renderContext, deferredInputs);
 
     gpu::doInBatch(_renderArgs->_context, [&](gpu::Batch& batch) {
         PROFILE_RANGE_BATCH(batch, "blit");
diff --git a/tests/gpu-test/src/TestWindow.h b/tests/gpu-test/src/TestWindow.h
index 5b6b205721..d6c11b7459 100644
--- a/tests/gpu-test/src/TestWindow.h
+++ b/tests/gpu-test/src/TestWindow.h
@@ -19,7 +19,7 @@
 #include <render/ShapePipeline.h>
 #include <render/Context.h>
 
-//#define DEFERRED_LIGHTING
+#define DEFERRED_LIGHTING
 
 class TestWindow : public QWindow {
 protected:
@@ -31,9 +31,14 @@ protected:
 #ifdef DEFERRED_LIGHTING
     // Prepare the ShapePipelines
     render::ShapePlumberPointer _shapePlumber { std::make_shared<render::ShapePlumber>() };
-    render::RenderContextPointer _renderContext { std::make_shared<render::RenderContext>() };
+    render::SceneContextPointer _sceneContext{ std::make_shared<render::SceneContext>() };
+    render::RenderContextPointer _renderContext{ std::make_shared<render::RenderContext>() };
     gpu::PipelinePointer _opaquePipeline;
     model::LightPointer _light { std::make_shared<model::Light>() };
+    
+    GenerateDeferredFrameTransform _generateDeferredFrameTransform;
+    PrepareDeferred _prepareDeferred;
+    RenderDeferred _renderDeferred;
 #endif
 
     RenderArgs* _renderArgs { new RenderArgs() };