From c47cee3f3bdc14ec8788b859ce823d1d6d16256b Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Mon, 8 Jun 2015 05:59:10 -0700 Subject: [PATCH] clean code for PR --- libraries/render-utils/src/TextureCache.cpp | 10 ---------- libraries/render-utils/src/TextureCache.h | 4 ---- 2 files changed, 14 deletions(-) diff --git a/libraries/render-utils/src/TextureCache.cpp b/libraries/render-utils/src/TextureCache.cpp index 354db7bc8d..97385cb060 100644 --- a/libraries/render-utils/src/TextureCache.cpp +++ b/libraries/render-utils/src/TextureCache.cpp @@ -52,8 +52,6 @@ void TextureCache::setFrameBufferSize(QSize frameBufferSize) { _primaryNormalTexture.reset(); _primarySpecularTexture.reset(); - _transparentFramebuffer.reset(); - _secondaryFramebuffer.reset(); _tertiaryFramebuffer.reset(); @@ -266,14 +264,6 @@ void TextureCache::setPrimaryDrawBuffers(gpu::Batch& batch, bool color, bool nor batch._glDrawBuffers(bufferCount, buffers); } -gpu::FramebufferPointer TextureCache::getTransparentFramebuffer() { - if (!_transparentFramebuffer) { - _transparentFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height())); - _transparentFramebuffer->setDepthStencilBuffer(getPrimaryDepthTexture(), getPrimaryDepthTexture()->getTexelFormat()); - } - return _transparentFramebuffer; -} - gpu::FramebufferPointer TextureCache::getSecondaryFramebuffer() { if (!_secondaryFramebuffer) { _secondaryFramebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(gpu::Element::COLOR_RGBA_32, _frameBufferSize.width(), _frameBufferSize.height())); diff --git a/libraries/render-utils/src/TextureCache.h b/libraries/render-utils/src/TextureCache.h index f5f9d976a8..ba7176b2a4 100644 --- a/libraries/render-utils/src/TextureCache.h +++ b/libraries/render-utils/src/TextureCache.h @@ -71,8 +71,6 @@ public: gpu::TexturePointer getPrimaryNormalTexture(); gpu::TexturePointer getPrimarySpecularTexture(); - gpu::FramebufferPointer getTransparentFramebuffer(); - /// Returns the ID of the primary framebuffer object's depth texture. This contains the Z buffer used in rendering. GLuint getPrimaryDepthTextureID(); GLuint getPrimaryColorTextureID(); @@ -126,8 +124,6 @@ private: gpu::FramebufferPointer _primaryFramebuffer; void createPrimaryFramebuffer(); - gpu::FramebufferPointer _transparentFramebuffer; - gpu::FramebufferPointer _secondaryFramebuffer; gpu::FramebufferPointer _tertiaryFramebuffer;