[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/source

[Markus Mohrhard]

 vcl/source/opengl/OpenGLContext.cxx |   39 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 4d2585e9b5595ed107d5e352757e6cecc832d6a8
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Oct 29 13:46:44 2014 +0100

    add more log messages
    
    Change-Id: Idd3d876a658ac38aa6b32a624dada6b57b021002

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 8aa97ff..c6ab13c 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -541,6 +541,7 @@ bool OpenGLContext::ImplInit()
             None
         };
         m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy, pFBC[best_fbc], 0, GL_TRUE, nContextAttribs);
+        SAL_INFO_IF(m_aGLWin.ctx, "vcl.opengl", "created a 3.2 core context");
 
     }
 #endif
commit ec1653d8cf7b2b41a2dcea0a159ac22f1786d30d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Oct 29 13:28:43 2014 +0100

    cosmetic clean-up
    
    Change-Id: I8a156e66bc1b0f87129dcd85d3cc98fda3ba85aa

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 9748270..8aa97ff 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -646,30 +646,31 @@ bool OpenGLContext::ImplInit()
         // enable vsync
         typedef GLint (*glXSwapIntervalProc)(GLint);
         glXSwapIntervalProc glXSwapInterval = (glXSwapIntervalProc) glXGetProcAddress( (const GLubyte*) "glXSwapIntervalSGI" );
-        if( glXSwapInterval ) {
-        int (*oldHandler)(Display* /*dpy*/, XErrorEvent* /*evnt*/);
+        if( glXSwapInterval )
+        {
+            int (*oldHandler)(Display* /*dpy*/, XErrorEvent* /*evnt*/);
 
-        XLockDisplay(m_aGLWin.dpy);
-        XSync(m_aGLWin.dpy, false);
-        // replace error handler temporarily
-        oldHandler = XSetErrorHandler( oglErrorHandler );
+            XLockDisplay(m_aGLWin.dpy);
+            XSync(m_aGLWin.dpy, false);
+            // replace error handler temporarily
+            oldHandler = XSetErrorHandler( oglErrorHandler );
 
-        errorTriggered = false;
+            errorTriggered = false;
 
-        glXSwapInterval( 1 );
+            glXSwapInterval( 1 );
 
-        // sync so that we possibly get an XError
-        glXWaitGL();
-        XSync(m_aGLWin.dpy, false);
+            // sync so that we possibly get an XError
+            glXWaitGL();
+            XSync(m_aGLWin.dpy, false);
 
-        if( errorTriggered )
-            SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?");
-        else
-            SAL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)");
+            if( errorTriggered )
+                SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?");
+            else
+                SAL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)");
 
-        // restore the error handler
-        XSetErrorHandler( oldHandler );
-        XUnlockDisplay(m_aGLWin.dpy);
+            // restore the error handler
+            XSetErrorHandler( oldHandler );
+            XUnlockDisplay(m_aGLWin.dpy);
         }
     }
 
@@ -730,7 +731,6 @@ void OpenGLContext::setWinSize(const Size& rSize)
     m_aGLWin.Height = rSize.Height();
 }
 
-
 void OpenGLContext::renderToFile()
 {
     int iWidth = m_aGLWin.Width;