summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-03 11:11:40 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-03 18:28:04 +0100
commitd7bd0d011616ecb370768c401cc85ae8b4faca66 (patch)
tree292701ca224c9d1c9f9f1d073aa2ba5e59994f4d /chart2
parentb07d8579594bc5e792118091c6da16cd25c5901d (diff)
fix a few OpenGL resource leaks
Change-Id: I4957595d9e71c557257b7287367ee4ba689025ba
Diffstat (limited to 'chart2')
-rwxr-xr-xchart2/source/view/main/OpenGLRender.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index fb6b37dbcd6f..9d1f1ddc07d2 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -727,9 +727,13 @@ void OpenGLRender::Release()
glDeleteProgram(m_CommonProID);
glDeleteProgram(m_TextProID);
glDeleteProgram(m_BackgroundProID);
+ glDeleteProgram(m_SymbolProID);
glDeleteFramebuffers(1, &m_FboID);
+ glDeleteFramebuffers(1, &m_frameBufferMS);
glDeleteTextures(1, &m_TextureObj);
glDeleteRenderbuffers(1, &m_RboID);
+ glDeleteRenderbuffers(1, &m_renderBufferColorMS);
+ glDeleteRenderbuffers(1, &m_renderBufferDepthMS);
#if defined( WNT )
wglMakeCurrent(NULL, NULL);
#elif defined( MACOSX )
@@ -757,6 +761,7 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
mxRenderTarget(xTarget),
mbArbMultisampleSupported(false),
m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
+ m_frameBufferMS(0),
m_TextVertexID(0),
m_TextTexCoordID(1),
m_ClearColor(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f))
@@ -780,6 +785,7 @@ OpenGLRender::~OpenGLRender()
Release();
}
+// TODO: moggi: that screws up FBO if called after buffers have been created!!!!
void OpenGLRender::SetWidth(int width)
{
m_iWidth = width;