summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-18 19:41:51 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-08-19 12:15:26 +0200
commit1a3bf54159f71f8feb67c89fa1e2452c31fc8701 (patch)
treef8eca3e1464fda60dad88e26a8b171bcf80046ad
parent5295459d0aff98f6817769b2eef279115e4ffad0 (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--slideshow/source/engine/opengl/TransitionImpl.cxx2
-rw-r--r--slideshow/source/engine/opengl/TransitionImpl.hxx2
2 files changed, 1 insertions, 3 deletions
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 )
{
}