diff options
-rw-r--r-- | compilerplugins/clang/virtualdead.unusedparams.results | 6 | ||||
-rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 14 | ||||
-rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.hxx | 4 |
3 files changed, 9 insertions, 15 deletions
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results b/compilerplugins/clang/virtualdead.unusedparams.results index e512aa6ecf29..74c5dc078e4a 100644 --- a/compilerplugins/clang/virtualdead.unusedparams.results +++ b/compilerplugins/clang/virtualdead.unusedparams.results @@ -286,12 +286,6 @@ sdext/source/presenter/PresenterScrollBar.hxx:180 slideshow/source/engine/animationfactory.cxx:443 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class slideshow::internal::ShapeAttributeLayer> &,) 00 -slideshow/source/engine/opengl/TransitionImpl.hxx:174 - void OGLTransitionImpl::prepare(double,double,double,double,double,) - 01100 -slideshow/source/engine/opengl/TransitionImpl.hxx:180 - void OGLTransitionImpl::finish(double,double,double,double,double,) - 00000 starmath/source/wordexportbase.hxx:37 void SmWordExportBase::HandleText(const class SmNode *,int,) 10 diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index 62127de1d93e..27f1ac28bb9a 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -227,11 +227,11 @@ void OGLTransitionImpl::finish() CHECK_GL_ERROR(); } -void OGLTransitionImpl::prepare( double, double, double, double, double ) +void OGLTransitionImpl::prepare( double, double ) { } -void OGLTransitionImpl::finish( double, double, double, double, double ) +void OGLTransitionImpl::cleanup() { } @@ -266,7 +266,7 @@ void OGLTransitionImpl::display( double nTime, sal_Int32 glLeavingSlideTex, sal_ CHECK_GL_ERROR(); glBindVertexArray(m_nVertexArrayObject); - prepare( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight ); + prepare( SlideWidth, SlideHeight ); CHECK_GL_ERROR(); displaySlides_( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale, pContext ); @@ -1878,7 +1878,7 @@ public: private: virtual GLuint makeShader() const override; virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override; - virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; + virtual void prepare( double SlideWidth, double SlideHeight ) override; glm::vec2 maCenter; GLint maSlideRatioLocation = -1; @@ -1901,7 +1901,7 @@ void RippleTransition::prepareTransition( sal_Int32, sal_Int32, OpenGLContext* ) CHECK_GL_ERROR(); } -void RippleTransition::prepare( double /* nTime */, double SlideWidth, double SlideHeight, double /* DispWidth */, double /* DispHeight */ ) +void RippleTransition::prepare( double SlideWidth, double SlideHeight ) { if( maSlideRatioLocation != -1 ) glUniform1f( maSlideRatioLocation, SlideWidth / SlideHeight ); @@ -1975,7 +1975,7 @@ public: private: virtual GLuint makeShader() const override; virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex, OpenGLContext *pContext ) override; - virtual void finish( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; + virtual void cleanup() override; GLuint maBuffer = 0; }; @@ -2025,7 +2025,7 @@ void GlitterTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int3 glBindBuffer(GL_ARRAY_BUFFER, 0); } -void GlitterTransition::finish( double, double, double, double, double ) +void GlitterTransition::cleanup() { CHECK_GL_ERROR(); glDeleteBuffers(1, &maBuffer); diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx index d2f78c6eb3d9..d0313236d8b4 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.hxx +++ b/slideshow/source/engine/opengl/TransitionImpl.hxx @@ -171,13 +171,13 @@ private: * * Default implementation does nothing. */ - virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); + virtual void prepare( double SlideWidth, double SlideHeight ); /** This function is called in display method to prepare the slides, scene, etc. * * Default implementation does nothing. */ - virtual void finish( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); + virtual void cleanup(); /** This function is called after glx context is ready to let the transition prepare GL related things, like GLSL program. * |