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

[Miklos Vajna]

 vcl/opengl/win/gdiimpl.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 04042e42cf839d16ef67adb67024e17315e5343f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri May 11 11:36:29 2018 +0200

    vcl opengl Windows: only log non-success wglMakeCurrent() failure reason
    
    The rendering result on this Intel card is acceptable, but the console
    is flooded with warnings saying wglMakeCurrent() failed with reason
    "success", which makes it hard to see any other more important message.
    
    I assume the root cause here is a broken driver.
    
    Change-Id: I112279e9d669b804baeb47383b8357f1a1b7fde5
    Reviewed-on: https://gerrit.libreoffice.org/54124
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 86e5bd4b958a..96f0b8bce57d 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -114,7 +114,9 @@ void WinOpenGLContext::makeCurrent()
     if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
     {
         g_bAnyCurrent = false;
-        SAL_WARN("vcl.opengl", "wglMakeCurrent failed: " << WindowsErrorString(GetLastError()));
+        DWORD nLastError = GetLastError();
+        if (nLastError != ERROR_SUCCESS)
+            SAL_WARN("vcl.opengl", "wglMakeCurrent failed: " << WindowsErrorString(nLastError));
         return;
     }