diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 14:11:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:34:24 +0000 |
| commit | 8bd9db90383ee008777903c35c7a5eb2c5352e71 (patch) | |
| tree | b478f9e0eb2b018da0337be995e2a1e6cd57a4a8 /slideshow/source/engine/opengl/TransitionImpl.hxx | |
| parent | 482d7ce61b423600b41b459eb26a2cc221cd0acf (diff) | |
gtk3: implement opengl support for slideshow
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'slideshow/source/engine/opengl/TransitionImpl.hxx')
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
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 <vector> 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. * |