vcl/opengl/win/gdiimpl.cxx | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 39b50f0cad5fe4576b4d112284938645a303e363
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
Date: Thu Jul 28 17:38:09 2016 +0900
opengl: don't initialize MSAA when we create VCL context
Change-Id: Ic8060ebdabb86d8b724ee419fdfcc1f58e8a0316
Reviewed-on: https://gerrit.libreoffice.org/27614
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index bd35667..09c123f8 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
