From 8bd9db90383ee008777903c35c7a5eb2c5352e71 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 25 Nov 2016 14:11:13 +0000 Subject: gtk3: implement opengl support for slideshow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all of them work, except "Fall" doesn't look right, but it has the exact same problem under gtk2/gen to. Change-Id: I73cb9c0fb8211f727198be78d90d4f80a4f8c7c8 Reviewed-on: https://gerrit.libreoffice.org/31214 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- slideshow/source/engine/opengl/TransitionImpl.hxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'slideshow/source/engine/opengl/TransitionImpl.hxx') diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx index 6f2e16450c2b..a7b2b42bbdff 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.hxx +++ b/slideshow/source/engine/opengl/TransitionImpl.hxx @@ -36,6 +36,7 @@ #include class Primitive; +class OpenGLContext; class Operation; class SceneObject; class TransitionData; @@ -136,10 +137,10 @@ public: /** Prepare transition. */ - bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ); + bool prepare( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ); /** Display a step of the transition. */ - void display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); + void display( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, OpenGLContext *pContext ); /** Clean up after transition. */ void finish(); @@ -182,7 +183,7 @@ private: * * Default implementation does nothing. */ - virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ); + virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ); /** This function is called when the transition needs to clear after itself, like delete own textures etc. * @@ -195,7 +196,7 @@ private: * Default implementation applies overall operations and then * displays both slides. */ - virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale ); + virtual void displaySlides_( double nTime, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale, OpenGLContext *pContext ); /** This function is called in prepare method to create the GL program. * -- cgit