diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-05 20:15:59 +0200 |
---|---|---|
committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2014-07-10 10:13:00 +0000 |
commit | bb84f7814dcc3b8f729eead8009f71ba698bb8db (patch) | |
tree | e82d42aba8e7b9de648dc84e3fc618344711af50 | |
parent | 1fd83db78cc08aca927682f71dde6294087dfc7c (diff) |
don't forget glewInit
Change-Id: Ifc1c995f50fe34dbb072345aab37190d3a57e074
Reviewed-on: https://gerrit.libreoffice.org/10094
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit b1d4fbb69491bcf211fb4c8cb5c2dd4d9efb4edb)
Reviewed-on: https://gerrit.libreoffice.org/10185
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
-rw-r--r-- | chart2/source/view/main/OpenGLRender.cxx | 3 | ||||
-rw-r--r-- | chart2/source/view/main/OpenGLRender.hxx | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 12dfb79a6fe4..688409851451 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 e88fffafee00..187cb5eef6f0 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 |