From 205c14eb433b567f4446a2f553b639170d5a71d1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 8 Jan 2016 18:04:02 -0800
Subject: [PATCH] Remove unused headers

---
 interface/src/ui/overlays/ImageOverlay.cpp                   | 1 -
 interface/src/ui/overlays/Overlay.cpp                        | 4 +---
 .../model-networking/src/model-networking/ModelCache.cpp     | 2 --
 libraries/model-networking/src/model-networking/ModelCache.h | 3 ---
 libraries/render-utils/src/AmbientOcclusionEffect.cpp        | 1 -
 libraries/render-utils/src/AntialiasingEffect.cpp            | 1 -
 libraries/render-utils/src/DeferredLightingEffect.cpp        | 1 -
 libraries/render-utils/src/GeometryCache.cpp                 | 5 ++---
 tests/gpu-test/src/main.cpp                                  | 1 -
 9 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp
index ed88f50981..8df62b9675 100644
--- a/interface/src/ui/overlays/ImageOverlay.cpp
+++ b/interface/src/ui/overlays/ImageOverlay.cpp
@@ -13,7 +13,6 @@
 #include <DependencyManager.h>
 #include <GeometryCache.h>
 #include <gpu/Context.h>
-#include <gpu/StandardShaderLib.h>
 #include <RegisteredMetaTypes.h>
 
 
diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 0c909a1bfb..0497a20500 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -222,10 +222,8 @@ float Overlay::updatePulse() {
 }
 
 bool Overlay::addToScene(Overlay::Pointer overlay, std::shared_ptr<render::Scene> scene, render::PendingChanges& pendingChanges) {
-    auto overlayPayload = new Overlay::Payload(overlay);
-    auto overlayPayloadPointer = Overlay::PayloadPointer(overlayPayload);
     _renderItemID = scene->allocateID();
-    pendingChanges.resetItem(_renderItemID, overlayPayloadPointer);
+    pendingChanges.resetItem(_renderItemID, std::make_shared<Overlay::Payload>(overlay));
     return true;
 }
 
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index 4fd47affc2..1d436851d7 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -22,8 +22,6 @@
 #include "TextureCache.h"
 #include "ModelNetworkingLogging.h"
 
-#include "gpu/StandardShaderLib.h"
-
 #include "model/TextureMap.h"
 
 //#define WANT_DEBUG
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index cd75794e2b..b2d81c5900 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -48,9 +48,6 @@ public:
     /// \param delayLoad if true, don't load the geometry immediately; wait until load is first requested
     QSharedPointer<NetworkGeometry> getGeometry(const QUrl& url, const QUrl& fallback = QUrl(), bool delayLoad = false);
 
-    /// Set a batch to the simple pipeline, returning the previous pipeline
-    void useSimpleDrawPipeline(gpu::Batch& batch, bool noBlend = false);
-
 private:
     ModelCache();
     virtual ~ModelCache();
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index 39097e485b..0dd2e080ec 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -16,7 +16,6 @@
 #include <SharedUtil.h>
 #include <gpu/Context.h>
 
-#include "gpu/StandardShaderLib.h"
 #include "AmbientOcclusionEffect.h"
 #include "TextureCache.h"
 #include "FramebufferCache.h"
diff --git a/libraries/render-utils/src/AntialiasingEffect.cpp b/libraries/render-utils/src/AntialiasingEffect.cpp
index 81ca5dcdaf..52e0836029 100644
--- a/libraries/render-utils/src/AntialiasingEffect.cpp
+++ b/libraries/render-utils/src/AntialiasingEffect.cpp
@@ -16,7 +16,6 @@
 #include <SharedUtil.h>
 #include <gpu/Context.h>
 
-#include "gpu/StandardShaderLib.h"
 #include "AntialiasingEffect.h"
 #include "TextureCache.h"
 #include "FramebufferCache.h"
diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp
index d5dd53c252..7c8aa393d4 100644
--- a/libraries/render-utils/src/DeferredLightingEffect.cpp
+++ b/libraries/render-utils/src/DeferredLightingEffect.cpp
@@ -17,7 +17,6 @@
 
 #include <gpu/Batch.h>
 #include <gpu/Context.h>
-#include <gpu/StandardShaderLib.h>
 
 #include "AbstractViewStateInterface.h"
 #include "GeometryCache.h"
diff --git a/libraries/render-utils/src/GeometryCache.cpp b/libraries/render-utils/src/GeometryCache.cpp
index 141d4f917d..87635eb9b6 100644
--- a/libraries/render-utils/src/GeometryCache.cpp
+++ b/libraries/render-utils/src/GeometryCache.cpp
@@ -1841,9 +1841,8 @@ void renderInstances(const std::string& name, gpu::Batch& batch, const Transform
         instanceColorBuffer->append(compactColor);
     }
     
-    auto that = DependencyManager::get<GeometryCache>();
-    batch.setupNamedCalls(name, [=](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
-        auto pipeline = that->bindSimpleProgram(batch);
+    batch.setupNamedCalls(name, [f](gpu::Batch& batch, gpu::Batch::NamedBatchData& data) {
+        auto pipeline = DependencyManager::get<GeometryCache>()->bindSimpleProgram(batch);
         auto location = pipeline->getProgram()->getUniforms().findLocation("Instanced");
         
         batch._glUniform1i(location, 1);
diff --git a/tests/gpu-test/src/main.cpp b/tests/gpu-test/src/main.cpp
index e185266408..f5ff7de035 100644
--- a/tests/gpu-test/src/main.cpp
+++ b/tests/gpu-test/src/main.cpp
@@ -30,7 +30,6 @@
 #include <gpu/Context.h>
 #include <gpu/Batch.h>
 #include <gpu/Stream.h>
-#include <gpu/StandardShaderLib.h>
 #include <gpu/GLBackend.h>
 
 #include <gl/QOpenGLContextWrapper.h>