[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/opengl/OpenGLContext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b716be0c06dd1385eb7ca1c4161233ee7e19314a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 15 19:23:35 2015 +0200

    Initialise bArbMultisampleSupported as false
    
    Otherwise the code doesn't make sense; InitMultisample() would return
    true even if no pixel format was chosen. Found by code reading by me
    and Emmanuel, not actually verified on non-multi-sample-capable
    hardware.
    
    Change-Id: I7197a1c72768bbf2c928193582104a82808ea53c

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index b4d53ea..36ede42 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -310,7 +310,7 @@ bool InitMultisample(const PIXELFORMATDESCRIPTOR& pfd, int& rPixelFormat,
         iAttributes[2] = WGL_DRAW_TO_BITMAP_ARB;
     }
 
-    bool bArbMultisampleSupported = true;
+    bool bArbMultisampleSupported = false;
 
     // First we check to see if we can get a pixel format for 8 samples
     valid = wglChoosePixelFormatARB(hDC, iAttributes, fAttributes, 1, &pixelFormat, &numFormats);