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

Markus Mohrhard markus.mohrhard at googlemail.com
Thu Jul 10 08:27:50 PDT 2014


 chart2/source/view/main/OpenGLRender.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2dccbe0593acef135b6acd3b5dc49edcf9e24f2f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Jul 10 11:16:40 2014 +0200

    we need to make sure the context is current
    
    Change-Id: Ia3d9df493899949f8de096f1cb0a3b63bffac0eb
    Reviewed-on: https://gerrit.libreoffice.org/10184
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 606af1462d81ac5188e0a6a3a1c270a327a68fd4)
    Reviewed-on: https://gerrit.libreoffice.org/10188
    Reviewed-by: Muthu Subramanian K <muthusuba at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 6884098..b325f1e 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -346,6 +346,7 @@ void OpenGLRender::renderDebug()
 
 void OpenGLRender::prepareToRender()
 {
+    aContext.makeCurrent();
     aContext.setWinSize(Size(m_iWidth, m_iHeight));
     glViewport(0, 0, m_iWidth, m_iHeight);
     if (!m_FboID[0])


More information about the Libreoffice-commits mailing list