slideshow/source/engine/opengl/TransitionImpl.cxx | 2 --
slideshow/source/engine/opengl/TransitionImpl.hxx | 2 +-
vcl/opengl/x11/gdiimpl.cxx | 4 +++-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1a3bf54159f71f8feb67c89fa1e2452c31fc8701
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 18 19:41:51 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 19 12:15:26 2018 +0200
Related: tdf#122166 require opengl >= 3.0 for slide transitions
glGenVertexArrays requires opengl >= 3.0
and since...
commit c831e4851f35ddef5ef45062ba291d07dda4b1b4
Date: Wed Dec 9 21:39:27 2015 +0000
slideshow: Fix what was remaining to be able to use a core context
we always use that in all slide transitions, so slideshow opengl transitions
presumably thus all have a min opengl version of 3.0
Change-Id: Ifb21201fc94c4a911c8d4127d1df1efb3e34a2d8
Reviewed-on: https://gerrit.libreoffice.org/59298
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 3cb49ea23061..f7f694fc26e9 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -730,7 +730,6 @@ std::shared_ptr<OGLTransitionImpl> makeTurnAround()
{
Primitive Slide;
TransitionSettings aSettings;
- aSettings.mnRequiredGLVersion = 3.0;
Slide.pushTriangle(glm::vec2(0,0),glm::vec2(1,0),glm::vec2(0,1));
Slide.pushTriangle(glm::vec2(1,0),glm::vec2(0,1),glm::vec2(1,1));
@@ -893,7 +892,6 @@ std::shared_ptr<OGLTransitionImpl> makeRochade()
{
Primitive Slide;
TransitionSettings aSettings;
- aSettings.mnRequiredGLVersion = 3.0;
double w, h;
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx
b/slideshow/source/engine/opengl/TransitionImpl.hxx
index bfd38fa89d71..d2f78c6eb3d9 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -46,7 +46,7 @@ struct TransitionSettings
TransitionSettings() :
mbUseMipMapLeaving( true ),
mbUseMipMapEntering( true ),
- mnRequiredGLVersion( 2.1f )
+ mnRequiredGLVersion( 3.0f )
{
}
commit 5295459d0aff98f6817769b2eef279115e4ffad0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Aug 18 20:00:42 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Aug 19 12:15:14 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/59300
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 27539319ed03..bcb533b56bf8 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -297,7 +297,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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
