From 6a076bcee4316d40bb7bec8c652c2abc4cff1145 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Fri, 19 Aug 2016 11:09:12 -0700
Subject: [PATCH] PRoviding a fix for the macOS build

---
 libraries/gpu/src/gpu/Buffer.h                  |  8 ++++----
 .../render-utils/src/AmbientOcclusionEffect.cpp | 17 +----------------
 .../render-utils/src/AmbientOcclusionEffect.h   |  9 ++++++---
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/libraries/gpu/src/gpu/Buffer.h b/libraries/gpu/src/gpu/Buffer.h
index 8160f648fc..9fc0108e35 100644
--- a/libraries/gpu/src/gpu/Buffer.h
+++ b/libraries/gpu/src/gpu/Buffer.h
@@ -180,10 +180,10 @@ public:
     using Index = int;
 
     BufferPointer _buffer;
-    Size _offset;
-    Size _size;
-    Element _element;
-    uint16 _stride;
+    Size _offset { 0 };
+    Size _size { 0 };
+    Element _element { DEFAULT_ELEMENT };
+    uint16 _stride { 0 };
 
     BufferView(const BufferView& view) = default;
     BufferView& operator=(const BufferView& view) = default;
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index 3470e4b8ff..5f3c3ca76a 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -340,7 +340,6 @@ void AmbientOcclusionEffect::run(const render::SceneContextPointer& sceneContext
     RenderArgs* args = renderContext->args;
 
     const auto& frameTransform = inputs.get0();
-    const auto& deferredFramebuffer = inputs.get1();
     const auto& linearDepthFramebuffer = inputs.get2();
     
     auto linearDepthTexture = linearDepthFramebuffer->getLinearDepthTexture();
@@ -372,13 +371,9 @@ void AmbientOcclusionEffect::run(const render::SceneContextPointer& sceneContext
     float tMin = occlusionViewport.y / (float)framebufferSize.y;
     float tHeight = occlusionViewport.w / (float)framebufferSize.y;
 
-    auto resolutionLevel = _parametersBuffer->getResolutionLevel();
-
 
     //_parametersBuffer->ditheringInfo.y += 0.25f;
 
-    // Running in stero ?
-    bool isStereo = args->_context->isStereo();
 
     auto occlusionPipeline = getOcclusionPipeline();
     auto firstHBlurPipeline = getHBlurPipeline();
@@ -486,13 +481,7 @@ void DebugAmbientOcclusion::run(const render::SceneContextPointer& sceneContext,
 
     RenderArgs* args = renderContext->args;
 
-    // FIXME: Different render modes should have different tasks
-//    if (args->_renderMode != RenderArgs::DEFAULT_RENDER_MODE) {
-//        return;
-//    }
-
     const auto& frameTransform = inputs.get0();
-    const auto& deferredFramebuffer = inputs.get1();
     const auto& linearDepthFramebuffer = inputs.get2();
     const auto& ambientOcclusionUniforms = inputs.get3();
     
@@ -519,11 +508,7 @@ void DebugAmbientOcclusion::run(const render::SceneContextPointer& sceneContext,
     float sWidth = occlusionViewport.z / (float)framebufferSize.x;
     float tMin = occlusionViewport.y / (float)framebufferSize.y;
     float tHeight = occlusionViewport.w / (float)framebufferSize.y;
-
-
-    // Running in stero ?
-    bool isStereo = args->_context->isStereo();
-
+    
     auto debugPipeline = getDebugPipeline();
     
     gpu::doInBatch(args->_context, [=](gpu::Batch& batch) {
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h
index 5fdea81979..0c393709d5 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.h
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.h
@@ -109,15 +109,18 @@ signals:
 namespace gpu {
 template <class T> class UniformBuffer : public gpu::BufferView {
   public:
+
+      static BufferPointer makeBuffer() {
+          T t;
+          return std::make_shared<gpu::Buffer>(sizeof(T), (const gpu::Byte*) &t);
+      }
     ~UniformBuffer<T>() {};
-    UniformBuffer<T>() : gpu::BufferView(std::make_shared<gpu::Buffer>(sizeof(T), (const gpu::Byte*) &T())) {}
+    UniformBuffer<T>() : gpu::BufferView(makeBuffer()) {}
 
     const T* operator ->() const { return &get<T>(); }  
     T* operator ->() { return &edit<T>(); }
 
 };
-
-
 }
 
 class AmbientOcclusionEffect {