[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - slideshow/source

[Libreoffice Gerrit user]

 slideshow/source/engine/opengl/TransitionImpl.cxx |    2 --
 slideshow/source/engine/opengl/TransitionImpl.hxx |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 55b3854b663dfd8ef47f1dddd03fd3849804243d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 18 19:41:51 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Aug 28 15:52:43 2018 +0200

    Related: tdf#112166 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/59299
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 927e0d72130d..d6573f835dd4 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -729,7 +729,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));
@@ -892,7 +891,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 )
     {
     }