[Libreoffice-commits] core.git: 2 commits - chart2/source vcl/source

[Markus Mohrhard]

 chart2/source/view/inc/GL3DRenderer.hxx  |    4 +---
 chart2/source/view/main/GL3DRenderer.cxx |   10 +---------
 vcl/source/opengl/OpenGLContext.cxx      |    1 +
 3 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 657004ae5c9f4a07b2cdafbb21bc8657842d4d74
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu May 8 02:25:18 2014 +0200

    we only want fb configs that support double buffered rendering
    
    Change-Id: I808e36ccd2a0d1ad89af2449d709d24a92ecff4f

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 33e2ffb..9db458c 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -711,6 +711,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent)
 
     static int visual_attribs[] =
     {
+        GLX_DOUBLEBUFFER,
         GLX_RED_SIZE,           8,
         GLX_GREEN_SIZE,         8,
         GLX_BLUE_SIZE,          8,
commit cfcb4a7cefebda88a70336afe15129304f202f6b
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu May 8 01:30:30 2014 +0200

    this inheritance is no longer needed
    
    Change-Id: I039dd767bcfd0c1343f4230d3fe8e52ab5a6e4fd

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 81c9315..1d103529 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -164,7 +164,7 @@ typedef struct SceneBox
 }SceneBox;
 
 
-class OpenGL3DRenderer : public IOpenGLInfoProvider
+class OpenGL3DRenderer
 {
 public:
     OpenGL3DRenderer();
@@ -174,7 +174,6 @@ public:
     void CreateRenderObj(int, int);
     void LoadShaders();
     void init();
-    virtual bool isOpenGLInitialized() SAL_OVERRIDE;
     void Set3DSenceInfo(sal_Int32 color = 255, bool twoSidesLighting = true);
     void SetLightInfo(bool lightOn, sal_Int32 color, const glm::vec4& direction);
     void AddShapePolygon3DObject(sal_Int32 color, bool lineOnly, sal_Int32 lineColor,
@@ -244,7 +243,6 @@ private:
     glm::mat4 m_Model;
     // Our ModelViewProjection : multiplication of our 3 matrices
     glm::mat4 m_MVP;
-    bool m_IsOpenglInit;
 #if 0
     double m_dFreq;
 #endif
diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx
index 54f5e3d..40a3885 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -56,8 +56,7 @@ int static checkGLError(const char *file, int line)
 }
 
 OpenGL3DRenderer::OpenGL3DRenderer():
-    m_IsOpenglInit(false)
-    , m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f)))
+    m_TranslationMatrix(glm::translate(m_Model, glm::vec3(0.0f, 0.0f, 0.0f)))
     , m_TextProID(0)
     , m_TextMatrixID(0)
     , m_TextVertexID(0)
@@ -253,7 +252,6 @@ void OpenGL3DRenderer::init()
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     CHECK_GL_ERROR();
     Init3DUniformBlock();
-    m_IsOpenglInit = true;
 }
 
 void OpenGL3DRenderer::SetSize(const Size& rSize)
@@ -262,12 +260,6 @@ void OpenGL3DRenderer::SetSize(const Size& rSize)
     m_iHeight = rSize.Height();
 }
 
-bool OpenGL3DRenderer::isOpenGLInitialized()
-{
-    return m_IsOpenglInit;
-}
-
-
 void OpenGL3DRenderer::AddVertexData(GLuint vertexBuf)
 {
     glBindBuffer(GL_ARRAY_BUFFER, vertexBuf);