[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-work' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |    7 ++++---
 chart2/source/view/main/OpenGLRender.hxx |    2 --
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 59f7f8cd289fadb0ee6dcdfc01018cb1f7fecc62
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jan 12 16:05:29 2014 +0100

    delete all programs at the end
    
    Change-Id: I6a2e0a70e9b6eadcb869596471f702bca4145336

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 66118fb..f81e94c 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -843,10 +843,12 @@ void OpenGLRender::Release()
 {
     glDeleteBuffers(1, &m_VertexBuffer);
     glDeleteBuffers(1, &m_ColorBuffer);
-    glDeleteProgram(m_ProgramID);
     glDeleteBuffers(1, &m_RenderVertexBuf);
     glDeleteBuffers(1, &m_RenderTexCoordBuf);
     glDeleteProgram(m_RenderProID);
+    glDeleteProgram(m_CommonProID);
+    glDeleteProgram(m_TextProID);
+    glDeleteProgram(m_BackgroundProID);
     glDeleteFramebuffers(1, &m_FboID);
     glDeleteTextures(1, &m_TextureObj);
     glDeleteRenderbuffers(1, &m_RboID);
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 41fa81e..65c0b91 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -209,8 +209,6 @@ private:
 
     glm::mat4 m_ScaleMatrix;
 
-    GLuint m_ProgramID;
-
     GLint m_RenderProID;
 
     glm::vec4 m_Line2DColor;
commit c102d8d4b8122c7d5e7bb32f663e43562a0bddf2
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sun Jan 12 16:02:17 2014 +0100

    use std::min
    
    Change-Id: I8ffaf5e5ed418901658ca6b7e3d1ad369ee0baba

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 99cb450..66118fb 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -967,8 +967,7 @@ void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b)
 
 void OpenGLRender::SetLine2DWidth(int width)
 {
-    m_fLineWidth = (float)width / 10.0f;
-    m_fLineWidth = (m_fLineWidth < 0.001) ? 0.001 : m_fLineWidth;
+    m_fLineWidth = std::max((float)width / 10.0f, 0.001f);
 }
 
 #if defined( _WIN32 )