[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |    3 +++
 chart2/source/view/main/OpenGLRender.hxx |    2 ++
 2 files changed, 5 insertions(+)

New commits:
commit bb84f7814dcc3b8f729eead8009f71ba698bb8db
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jul 5 20:15:59 2014 +0200

    don't forget glewInit
    
    Change-Id: Ifc1c995f50fe34dbb072345aab37190d3a57e074
    Reviewed-on: https://gerrit.libreoffice.org/10094
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit b1d4fbb69491bcf211fb4c8cb5c2dd4d9efb4edb)
    Reviewed-on: https://gerrit.libreoffice.org/10185
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Zolnai Tamás <zolnaitamas2000 at gmail.com>
    Tested-by: Zolnai Tamás <zolnaitamas2000 at gmail.com>

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 12dfb79..6884098 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -120,6 +120,8 @@ int OpenGLRender::InitOpenGL()
     //TODO: moggi: get the information from the context
     mbArbMultisampleSupported = true;
 
+    aContext.init();
+
     if (glewIsSupported("framebuffer_object") != GLEW_OK)
     {
         SAL_WARN("chart2.opengl", "GL stack has no framebuffer support");
@@ -344,6 +346,7 @@ void OpenGLRender::renderDebug()
 
 void OpenGLRender::prepareToRender()
 {
+    aContext.setWinSize(Size(m_iWidth, m_iHeight));
     glViewport(0, 0, m_iWidth, m_iHeight);
     if (!m_FboID[0])
     {
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index e88fffa..187cb5e 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -119,6 +119,8 @@ public:
 
 private:
 
+    OpenGLContext aContext;
+
     com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTarget;
 
 #if 0