[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/opengl

[Libreoffice Gerrit user]

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

New commits:
commit 43b5ac85b6e2e31d6505223ab6e29babb06ceafd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 18 20:00:42 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Aug 28 15:51:59 2018 +0200

    tdf#112166 need to check if glXCreateContextAttribsARB really exists
    
    checking the glXCreateContextAttribsARB function pointer will just return the
    epoxy_glXCreateContextAttribsARB stub which always exists.
    
    Change-Id: I740cc680082102c1f9712cf5cc083e92b26f8865
    Reviewed-on: https://gerrit.libreoffice.org/59301
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 2e8fffe7c0f6..a8391999ec1e 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -296,7 +296,9 @@ bool X11OpenGLContext::ImplInit()
     if (!g_vShareList.empty())
         pSharedCtx = g_vShareList.front();
 
-    if (glXCreateContextAttribsARB && !mbRequestLegacyContext)
+    //tdf#112166 for, e.g. VirtualBox GL, claiming OpenGL 2.1
+    static bool hasCreateContextAttribsARB = glXGetProcAddress(reinterpret_cast<const GLubyte*>("glXCreateContextAttribsARB")) != nullptr;
+    if (hasCreateContextAttribsARB && !mbRequestLegacyContext)
     {
         int best_fbc = -1;
         GLXFBConfig* pFBC = getFBConfig(m_aGLWin.dpy, m_aGLWin.win, best_fbc, mbUseDoubleBufferedRendering);