summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-07-28 17:38:09 +0900
committerTomaž Vajngerl <quikee@gmail.com>2016-07-28 13:07:21 +0000
commit39b50f0cad5fe4576b4d112284938645a303e363 (patch)
treefd2d8ea69a56246a95beb2d01f9578b3322613c6
parent7480838db5cd695fc46362dae291f9c1052321d8 (diff)
opengl: don't initialize MSAA when we create VCL context
Change-Id: Ic8060ebdabb86d8b724ee419fdfcc1f58e8a0316 Reviewed-on: https://gerrit.libreoffice.org/27614 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/opengl/win/gdiimpl.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index bd35667695dc..09c123f8411e 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -514,8 +514,13 @@ bool WinOpenGLContext::ImplInit()
// we must check whether can set the MSAA
int WindowPix = 0;
- bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix,
- mbUseDoubleBufferedRendering, false);
+ bool bMultiSampleSupport = false;
+
+ if (!mbVCLOnly)
+ bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix, mbUseDoubleBufferedRendering, false);
+ else
+ VCL_GL_INFO("Skipping multisample detection for VCL.");
+
if (bMultiSampleSupport && WindowPix != 0)
{
m_aGLWin.bMultiSampleSupported = true;