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

[Jan Holesovsky]

 vcl/source/opengl/OpenGLContext.cxx |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit fc4000a9be34304790219f08adfa924801f736e1
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon May 5 16:46:59 2014 +0200

    openGL: More debug info.
    
    Change-Id: Ia2e09c92673b97fd48c4ede7ebb9ff47da821926

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 18530ae..5271214 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -435,7 +435,12 @@ bool OpenGLContext::ImplInit()
     }
     SetPixelFormat(m_aGLWin.hDC,WindowPix,&PixelFormatFront);
     m_aGLWin.hRC  = wglCreateContext(m_aGLWin.hDC);
-    wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC);
+
+    if (!wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC))
+    {
+        SAL_WARN("vcl.opengl", "Failed wglMakeCurrent: " << GetLastError());
+        return false;
+    }
 
 #elif defined( MACOSX )
 
@@ -506,9 +511,10 @@ bool OpenGLContext::ImplInit()
     if(!bGlewInit)
     {
         glewExperimental = GL_TRUE;
-        if (glewInit() != GLEW_OK)
+        GLenum err = glewInit();
+        if (err != GLEW_OK)
         {
-            SAL_WARN("vcl.opengl", "Failed to initialize GLEW");
+            SAL_WARN("vcl.opengl", "Failed to initialize GLEW: " << glewGetErrorString(err));
             return false;
         }
         else