From 6bc3d65bf4cfe58e3ba12a75979baa13ce3228ce Mon Sep 17 00:00:00 2001
From: Niraj Venkat <venkatn93@gmail.com>
Date: Fri, 24 Jul 2015 16:16:18 -0700
Subject: [PATCH] Fixing build errors

---
 libraries/render-utils/src/AmbientOcclusionEffect.cpp | 11 +----------
 libraries/render-utils/src/AmbientOcclusionEffect.h   |  4 ----
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.cpp b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
index da081f7811..d7fa88b276 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.cpp
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.cpp
@@ -149,7 +149,7 @@ const gpu::PipelinePointer& AmbientOcclusion::getHBlurPipeline() {
 
 const gpu::PipelinePointer& AmbientOcclusion::getBlendPipeline() {
     if (!_blendPipeline) {
-        auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(occlusion_blend_vert)));
+        auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(ambient_occlusion_vert)));
         auto ps = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(occlusion_blend_frag)));
         gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vs, ps));
 
@@ -166,15 +166,6 @@ const gpu::PipelinePointer& AmbientOcclusion::getBlendPipeline() {
         state->setBlendFunction(true,
             gpu::State::SRC_COLOR, gpu::State::BLEND_OP_ADD, gpu::State::DEST_COLOR);
 
-        // Link the blend FBO to texture
-        _blendBuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32,
-            DependencyManager::get<FramebufferCache>()->getFrameBufferSize().width(), DependencyManager::get<FramebufferCache>()->getFrameBufferSize().height()));
-        auto format = gpu::Element(gpu::VEC4, gpu::NUINT8, gpu::RGBA);
-        auto width = _blendBuffer->getWidth();
-        auto height = _blendBuffer->getHeight();
-        auto defaultSampler = gpu::Sampler(gpu::Sampler::FILTER_MIN_MAG_POINT);
-        _blendTexture = gpu::TexturePointer(gpu::Texture::create2D(format, width, height, defaultSampler));
-
         // Good to go add the brand new pipeline
         _blendPipeline.reset(gpu::Pipeline::create(program, state));
     }
diff --git a/libraries/render-utils/src/AmbientOcclusionEffect.h b/libraries/render-utils/src/AmbientOcclusionEffect.h
index ec0314016c..76cb0b063d 100644
--- a/libraries/render-utils/src/AmbientOcclusionEffect.h
+++ b/libraries/render-utils/src/AmbientOcclusionEffect.h
@@ -28,7 +28,6 @@ public:
     const gpu::PipelinePointer& getHBlurPipeline();
     const gpu::PipelinePointer& getVBlurPipeline();
     const gpu::PipelinePointer& getBlendPipeline();
-    const gpu::PipelinePointer& getAOResultPipeline();
 
 private:
 
@@ -48,17 +47,14 @@ private:
     gpu::PipelinePointer _hBlurPipeline;
     gpu::PipelinePointer _vBlurPipeline;
     gpu::PipelinePointer _blendPipeline;
-    gpu::PipelinePointer _AOResultPipeline;
 
     gpu::FramebufferPointer _occlusionBuffer;
     gpu::FramebufferPointer _hBlurBuffer;
     gpu::FramebufferPointer _vBlurBuffer;
-    gpu::FramebufferPointer _blendBuffer;
 
     gpu::TexturePointer _occlusionTexture;
     gpu::TexturePointer _hBlurTexture;
     gpu::TexturePointer _vBlurTexture;
-    gpu::TexturePointer _blendTexture;
 
 };