[Libreoffice-commits] core.git: Branch 'private/moggi/chart-lifetime-fixes' - 2 commits - chart2/source include/svx include/vcl svx/source vcl/Library_vclopengl.mk vcl/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Mon Apr 14 15:59:17 PDT 2014
chart2/source/view/inc/3DBarChart.hxx | 2
chart2/source/view/inc/3DChartObjects.hxx | 2
chart2/source/view/main/DummyXShape.hxx | 2
chart2/source/view/main/OpenGLRender.cxx | 141 ------------
chart2/source/view/main/OpenGLRender.hxx | 3
chart2/source/view/main/OpenglShapeFactory.cxx | 2
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx | 2
include/svx/svdoopengl.hxx | 4
include/vcl/IOpenGLRenderer.hxx | 47 ----
include/vcl/OpenGLContext.hxx | 172 ---------------
include/vcl/opengl/IOpenGLRenderer.hxx | 47 ++++
include/vcl/opengl/OpenGLContext.hxx | 172 +++++++++++++++
include/vcl/opengl/OpenGLHelper.hxx | 27 ++
svx/source/svdraw/svdoopengl.cxx | 2
vcl/Library_vclopengl.mk | 1
vcl/source/opengl/OpenGLContext.cxx | 2
vcl/source/opengl/OpenGLHelper.cxx | 145 ++++++++++++
17 files changed, 408 insertions(+), 365 deletions(-)
New commits:
commit 9028f22b61613e6deef3f015e6c8910827047c4a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue Apr 15 00:55:07 2014 +0200
move some common OpenGL methods to vcl
Change-Id: Ic96487afce64bfb0c1dfcc03c088e5d6e1b34ad3
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 01331a0..0ccb353 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -35,9 +35,7 @@
#include <vcl/virdev.hxx>
#include <vcl/dibtools.hxx>
-#include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
-#include <config_folders.h>
+#include <vcl/opengl/OpenGLHelper.hxx>
#include <boost/scoped_array.hpp>
@@ -96,133 +94,6 @@ static bool bGlewInit = false;
namespace {
-OUString getShaderFolder()
-{
- OUString aUrl("$BRAND_BASE_DIR/" LIBO_ETC_FOLDER);
- rtl::Bootstrap::expandMacros(aUrl);
-
- return aUrl + "/opengl/";
-}
-
-OUString maShaderFolder = getShaderFolder();
-
-OString loadShader(const OUString& rFilename)
-{
- OUString aFileURL = maShaderFolder + rFilename +".glsl";
- osl::File aFile(aFileURL);
- if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
- {
- sal_uInt64 nSize = 0;
- aFile.getSize(nSize);
- char* content = new char[nSize+1];
- sal_uInt64 nBytesRead = 0;
- aFile.read(content, nSize, nBytesRead);
- if(nSize != nBytesRead)
- assert(false);
-
- content[nSize] = 0;
- return OString(content);
- }
- else
- {
- SAL_WARN("chart2.opengl", "could not load the file: " << aFileURL);
- }
-
- return OString();
-}
-
-}
-
-GLint OpenGLRender::LoadShaders(const OUString& rVertexShaderName,const OUString& rFragmentShaderName)
-{
- // Create the shaders
- GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
- GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-
- GLint Result = GL_FALSE;
- int InfoLogLength;
-
- // Compile Vertex Shader
- OString aVertexShaderSource = loadShader(rVertexShaderName);
- char const * VertexSourcePointer = aVertexShaderSource.getStr();
- glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL);
- glCompileShader(VertexShaderID);
-
- // Check Vertex Shader
- glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
- if ( !Result )
- {
- glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
- if ( InfoLogLength > 0 )
- {
- std::vector<char> VertexShaderErrorMessage(InfoLogLength+1);
- glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL, &VertexShaderErrorMessage[0]);
- VertexShaderErrorMessage.push_back('\0');
- SAL_WARN("chart2.opengl", "vertex shader compile failed : " << &VertexShaderErrorMessage[0]);
- }
- else
- SAL_WARN("chart2.opengl", "vertex shader compile failed without error log");
-
- return 0;
- }
-
- // Compile Fragment Shader
- OString aFragmentShaderSource = loadShader(rFragmentShaderName);
- char const * FragmentSourcePointer = aFragmentShaderSource.getStr();
- glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , NULL);
- glCompileShader(FragmentShaderID);
-
- // Check Fragment Shader
- glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
- if ( !Result )
- {
- glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
- if ( InfoLogLength > 0 )
- {
- std::vector<char> FragmentShaderErrorMessage(InfoLogLength+1);
- glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL, &FragmentShaderErrorMessage[0]);
- FragmentShaderErrorMessage.push_back('\0');
- SAL_WARN("chart2.opengl", "fragment shader compile failed : " << &FragmentShaderErrorMessage[0]);
- }
- else
- SAL_WARN("chart2.opengl", "fragment shader compile failed without error log");
-
-
- return 0;
- }
-
- // Link the program
- GLint ProgramID = glCreateProgram();
- glAttachShader(ProgramID, VertexShaderID);
- glAttachShader(ProgramID, FragmentShaderID);
- glLinkProgram(ProgramID);
-
- // Check the program
- glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
- if ( !Result )
- {
- glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
- if ( InfoLogLength > 0 )
- {
- std::vector<char> ProgramErrorMessage(InfoLogLength+1);
- glGetProgramInfoLog(ProgramID, InfoLogLength, NULL, &ProgramErrorMessage[0]);
- ProgramErrorMessage.push_back('\0');
- SAL_WARN("chart2.opengl", "Shader Program failed : " << &ProgramErrorMessage[0]);
- }
- else
- SAL_WARN("chart2.opengl", "shader program link failed without error log");
-
- return 0;
- }
-
- glDeleteShader(VertexShaderID);
- glDeleteShader(FragmentShaderID);
-
- return ProgramID;
-}
-
-namespace {
-
GLfloat texCoords[] = {
0.0f, 0.0f,
1.0f, 0.0f,
@@ -287,26 +158,26 @@ int OpenGLRender::InitOpenGL()
CHECK_GL_ERROR();
- m_CommonProID = LoadShaders("commonVertexShader", "commonFragmentShader");
+ m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader", "commonFragmentShader");
m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition");
m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
CHECK_GL_ERROR();
#if DEBUG_POSITIONING
- m_DebugProID = LoadShaders("debugVertexShader", "debugFragmentShader");
+ m_DebugProID = OpenGLHelper::LoadShaders("debugVertexShader", "debugFragmentShader");
m_DebugVertexID = glGetAttribLocation(m_DebugProID, "vPosition");
CHECK_GL_ERROR();
#endif
- m_BackgroundProID = LoadShaders("backgroundVertexShader", "backgroundFragmentShader");
+ m_BackgroundProID = OpenGLHelper::LoadShaders("backgroundVertexShader", "backgroundFragmentShader");
m_BackgroundMatrixID = glGetUniformLocation(m_BackgroundProID, "MVP");
m_BackgroundVertexID = glGetAttribLocation(m_BackgroundProID, "vPosition");
m_BackgroundColorID = glGetAttribLocation(m_BackgroundProID, "vColor");
CHECK_GL_ERROR();
- m_SymbolProID = LoadShaders("symbolVertexShader", "symbolFragmentShader");
+ m_SymbolProID = OpenGLHelper::LoadShaders("symbolVertexShader", "symbolFragmentShader");
m_SymbolVertexID = glGetAttribLocation(m_SymbolProID, "vPosition");
m_SymbolMatrixID = glGetUniformLocation(m_SymbolProID, "MVP");
m_SymbolColorID = glGetUniformLocation(m_SymbolProID, "vColor");
@@ -314,7 +185,7 @@ int OpenGLRender::InitOpenGL()
CHECK_GL_ERROR();
- m_TextProID = LoadShaders("textVertexShader", "textFragmentShader");
+ m_TextProID = OpenGLHelper::LoadShaders("textVertexShader", "textFragmentShader");
m_TextMatrixID = glGetUniformLocation(m_TextProID, "MVP");
m_TextVertexID = glGetAttribLocation(m_TextProID, "vPosition");
m_TextTexCoordID = glGetAttribLocation(m_TextProID, "texCoord");
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index d0121ad..2f79e1c 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -108,7 +108,6 @@ public:
void SetBackGroundColor(sal_uInt32 color1, sal_uInt32 color2, sal_uInt8 nAlpha);
private:
- GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName);
int CreateTextureObj(int width, int height);
int CreateRenderObj(int width, int height);
int CreateFrameBufferObj();
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
new file mode 100644
index 0000000..77d1b28
--- /dev/null
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef VCL_OPENGLHELPERS_HXX
+#define VCL_OPENGLHELPERS_HXX
+
+#include <GL/glew.h>
+#include <vcl/vclopengl_dllapi.hxx>
+
+#include <rtl/ustring.hxx>
+
+class VCLOPENGL_DLLPUBLIC OpenGLHelper
+{
+public:
+ static GLint LoadShaders(const OUString& rVertexShaderName, const OUString& rFragmentShaderName);
+
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vclopengl.mk b/vcl/Library_vclopengl.mk
index e14899b..84310bb8 100644
--- a/vcl/Library_vclopengl.mk
+++ b/vcl/Library_vclopengl.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,vclopengl,\
$(eval $(call gb_Library_add_exception_objects,vclopengl,\
vcl/source/opengl/OpenGLContext \
+ vcl/source/opengl/OpenGLHelper \
))
ifeq ($(strip $(OS)),WNT)
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
new file mode 100644
index 0000000..75eefe7
--- /dev/null
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -0,0 +1,145 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <vcl/opengl/OpenGLHelper.hxx>
+
+#include <osl/file.hxx>
+#include <rtl/bootstrap.hxx>
+#include <config_folders.h>
+
+#include <vector>
+
+namespace {
+
+OUString getShaderFolder()
+{
+ OUString aUrl("$BRAND_BASE_DIR/" LIBO_ETC_FOLDER);
+ rtl::Bootstrap::expandMacros(aUrl);
+
+ return aUrl + "/opengl/";
+}
+
+OUString maShaderFolder = getShaderFolder();
+
+OString loadShader(const OUString& rFilename)
+{
+ OUString aFileURL = maShaderFolder + rFilename +".glsl";
+ osl::File aFile(aFileURL);
+ if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
+ {
+ sal_uInt64 nSize = 0;
+ aFile.getSize(nSize);
+ char* content = new char[nSize+1];
+ sal_uInt64 nBytesRead = 0;
+ aFile.read(content, nSize, nBytesRead);
+ if(nSize != nBytesRead)
+ assert(false);
+
+ content[nSize] = 0;
+ return OString(content);
+ }
+ else
+ {
+ SAL_WARN("vcl.opengl", "could not load the file: " << aFileURL);
+ }
+
+ return OString();
+}
+
+}
+
+GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,const OUString& rFragmentShaderName)
+{
+ // Create the shaders
+ GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
+ GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
+
+ GLint Result = GL_FALSE;
+ int InfoLogLength;
+
+ // Compile Vertex Shader
+ OString aVertexShaderSource = loadShader(rVertexShaderName);
+ char const * VertexSourcePointer = aVertexShaderSource.getStr();
+ glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL);
+ glCompileShader(VertexShaderID);
+
+ // Check Vertex Shader
+ glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
+ if ( !Result )
+ {
+ glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+ if ( InfoLogLength > 0 )
+ {
+ std::vector<char> VertexShaderErrorMessage(InfoLogLength+1);
+ glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL, &VertexShaderErrorMessage[0]);
+ VertexShaderErrorMessage.push_back('\0');
+ SAL_WARN("vcl.opengl", "vertex shader compile failed : " << &VertexShaderErrorMessage[0]);
+ }
+ else
+ SAL_WARN("vcl.opengl", "vertex shader compile failed without error log");
+
+ return 0;
+ }
+
+ // Compile Fragment Shader
+ OString aFragmentShaderSource = loadShader(rFragmentShaderName);
+ char const * FragmentSourcePointer = aFragmentShaderSource.getStr();
+ glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , NULL);
+ glCompileShader(FragmentShaderID);
+
+ // Check Fragment Shader
+ glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
+ if ( !Result )
+ {
+ glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+ if ( InfoLogLength > 0 )
+ {
+ std::vector<char> FragmentShaderErrorMessage(InfoLogLength+1);
+ glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL, &FragmentShaderErrorMessage[0]);
+ FragmentShaderErrorMessage.push_back('\0');
+ SAL_WARN("vcl.opengl", "fragment shader compile failed : " << &FragmentShaderErrorMessage[0]);
+ }
+ else
+ SAL_WARN("vcl.opengl", "fragment shader compile failed without error log");
+
+
+ return 0;
+ }
+
+ // Link the program
+ GLint ProgramID = glCreateProgram();
+ glAttachShader(ProgramID, VertexShaderID);
+ glAttachShader(ProgramID, FragmentShaderID);
+ glLinkProgram(ProgramID);
+
+ // Check the program
+ glGetProgramiv(ProgramID, GL_LINK_STATUS, &Result);
+ if ( !Result )
+ {
+ glGetProgramiv(ProgramID, GL_INFO_LOG_LENGTH, &InfoLogLength);
+ if ( InfoLogLength > 0 )
+ {
+ std::vector<char> ProgramErrorMessage(InfoLogLength+1);
+ glGetProgramInfoLog(ProgramID, InfoLogLength, NULL, &ProgramErrorMessage[0]);
+ ProgramErrorMessage.push_back('\0');
+ SAL_WARN("vcl.opengl", "Shader Program failed : " << &ProgramErrorMessage[0]);
+ }
+ else
+ SAL_WARN("vcl.opengl", "shader program link failed without error log");
+
+ return 0;
+ }
+
+ glDeleteShader(VertexShaderID);
+ glDeleteShader(FragmentShaderID);
+
+ return ProgramID;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a94d0079cff1c9ca7f900bf55efb0577887b0802
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue Apr 15 00:43:50 2014 +0200
move the opengl headers to vcl/opengl for better separation
Change-Id: I1bdd0fe0d27674da69a61bd8b438f0c9b050a337
diff --git a/chart2/source/view/inc/3DBarChart.hxx b/chart2/source/view/inc/3DBarChart.hxx
index 2f10ce2..c8911a5 100644
--- a/chart2/source/view/inc/3DBarChart.hxx
+++ b/chart2/source/view/inc/3DBarChart.hxx
@@ -11,7 +11,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include "VDataSeries.hxx"
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
namespace chart {
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index edcd273..0483a74 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -12,7 +12,7 @@
#include <tools/color.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
namespace chart {
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index 81a088a..b5aeb26 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -12,7 +12,7 @@
#include <cppuhelper/implbase6.hxx>
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
#include "OpenGLRender.hxx"
#include <com/sun/star/drawing/XShape.hpp>
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 6fde176..d0121ad 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -11,7 +11,7 @@
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <vcl/font.hxx>
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
// Include GLM
#include <list>
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 34c2ea6..64b517e 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -47,7 +47,7 @@
#include <rtl/math.hxx>
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
-#include <vcl/IOpenGLRenderer.hxx>
+#include <vcl/opengl/IOpenGLRenderer.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
diff --git a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
index f540624c..837f637 100644
--- a/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFOPENGL_HXX
#include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
class Window;
diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx
index a8e7a42..3fcbba2 100644
--- a/include/svx/svdoopengl.hxx
+++ b/include/svx/svdoopengl.hxx
@@ -11,9 +11,9 @@
#define INCLUDED_SVX_SVDO_OPENGL_HXX
#include <svx/svdobj.hxx>
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
-#include <vcl/IOpenGLRenderer.hxx>
+#include <vcl/opengl/IOpenGLRenderer.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/include/vcl/IOpenGLRenderer.hxx b/include/vcl/opengl/IOpenGLRenderer.hxx
similarity index 100%
rename from include/vcl/IOpenGLRenderer.hxx
rename to include/vcl/opengl/IOpenGLRenderer.hxx
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
similarity index 100%
rename from include/vcl/OpenGLContext.hxx
rename to include/vcl/opengl/OpenGLContext.hxx
diff --git a/svx/source/svdraw/svdoopengl.cxx b/svx/source/svdraw/svdoopengl.cxx
index ce11c0d..178afcc 100644
--- a/svx/source/svdraw/svdoopengl.cxx
+++ b/svx/source/svdraw/svdoopengl.cxx
@@ -10,7 +10,7 @@
#include <svx/svdoopengl.hxx>
#include <svx/sdr/contact/viewcontactofopenglobj.hxx>
-#include <vcl/IOpenGLRenderer.hxx>
+#include <vcl/opengl/IOpenGLRenderer.hxx>
SdrOpenGLObj::~SdrOpenGLObj()
{
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index bd8065a..4b420182 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <vcl/OpenGLContext.hxx>
+#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
More information about the Libreoffice-commits
mailing list