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

Michael Meeks michael.meeks at collabora.com
Mon Nov 16 09:18:53 PST 2015


 vcl/source/opengl/OpenGLContext.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ad05823f6c2edb0f5fbf5794b2deb6c163686a2
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Mon Nov 16 14:16:32 2015 +0000

    Add comment to 'direct' parameter: un-related to double-buffering.
    
    Change-Id: I07002fd73fc004439aea75c5aca8ca3700ec1079
    Reviewed-on: https://gerrit.libreoffice.org/19996
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 8088b65..6929bbc 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -742,7 +742,7 @@ bool OpenGLContext::ImplInit()
                 GLX_CONTEXT_MINOR_VERSION_ARB, 2,
                 None
             };
-            m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy, pFBC[best_fbc], pSharedCtx, GL_TRUE, pContextAttribs);
+            m_aGLWin.ctx = glXCreateContextAttribsARB(m_aGLWin.dpy, pFBC[best_fbc], pSharedCtx, /* direct, not via X */ GL_TRUE, pContextAttribs);
             SAL_INFO_IF(m_aGLWin.ctx, "vcl.opengl", "created a 3.2 core context");
         }
         else
@@ -759,7 +759,7 @@ bool OpenGLContext::ImplInit()
         m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy,
                 m_aGLWin.vi,
                 pSharedCtx,
-                GL_TRUE);
+                GL_TRUE /* direct, not via X server */);
     }
 
     if( m_aGLWin.ctx )


More information about the Libreoffice-commits mailing list