From 482df7a7c7b2885abca03ff697d8b083f0181678 Mon Sep 17 00:00:00 2001 From: rachytski Date: Thu, 26 Jan 2012 13:14:16 +0400 Subject: [PATCH] code cleanup --- yg/renderbuffer.cpp | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/yg/renderbuffer.cpp b/yg/renderbuffer.cpp index 7b74a8e9c3..73969c5a93 100644 --- a/yg/renderbuffer.cpp +++ b/yg/renderbuffer.cpp @@ -24,7 +24,6 @@ namespace yg RenderBuffer::RenderBuffer(size_t width, size_t height, bool isDepthBuffer) : m_id(0), m_isDepthBuffer(isDepthBuffer), m_width(width), m_height(height) { -// if (!m_isDepthBuffer) { OGLCHECK(glGenRenderbuffersFn(1, &m_id)); @@ -38,33 +37,12 @@ namespace yg m_width, m_height)); } -/* else - { - OGLCHECK(glGenTextures(1, &m_id)); - - OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id)); - - OGLCHECK(glTexImage2D(GL_TEXTURE_2D, - 0, - GL_DEPTH_COMPONENT24_MWM, - m_width, - m_height, - 0, - GL_DEPTH_COMPONENT24_MWM, - GL_UNSIGNED_INT_24_8_MWM, - 0)); - }*/ } RenderBuffer::~RenderBuffer() { if (g_hasContext) - { -// if(m_isDepthBuffer) -// OGLCHECK(glDeleteTextures(1, &m_id)); -// else - OGLCHECK(glDeleteRenderbuffersFn(1, &m_id)); - } + OGLCHECK(glDeleteRenderbuffersFn(1, &m_id)); } unsigned int RenderBuffer::id() const @@ -74,20 +52,11 @@ namespace yg void RenderBuffer::attachToFrameBuffer() { -/* if (m_isDepthBuffer) - OGLCHECK(glFramebufferTexture2DFn( - GL_FRAMEBUFFER_MWM, - GL_DEPTH_ATTACHMENT_MWM, - GL_TEXTURE_2D, - id(), - 0 - )); - else*/ - OGLCHECK(glFramebufferRenderbufferFn( - GL_FRAMEBUFFER_MWM, - isDepthBuffer() ? GL_DEPTH_ATTACHMENT_MWM : GL_COLOR_ATTACHMENT0_MWM, - GL_RENDERBUFFER_MWM, - id())); + OGLCHECK(glFramebufferRenderbufferFn( + GL_FRAMEBUFFER_MWM, + isDepthBuffer() ? GL_DEPTH_ATTACHMENT_MWM : GL_COLOR_ATTACHMENT0_MWM, + GL_RENDERBUFFER_MWM, + id())); if (!isDepthBuffer()) utils::setupCoordinates(width(), height(), false);