Bugzilla – Attachment 125326 Details for
Bug 97195
Impress slide transition Shape group -- Diamond effect fatal error crash
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
this makes it not crash, but results in no visible transition
0001-feeble-attempt-to-fix-this-at-least-doesn-t-crash.patch (text/plain), 4.64 KB, created by
Caolán McNamara
on 2016-05-27 10:56:31 UTC
(
hide
)
Description:
this makes it not crash, but results in no visible transition
Filename:
MIME Type:
Creator:
Caolán McNamara
Created:
2016-05-27 10:56:31 UTC
Size:
4.64 KB
patch
obsolete
>From f7625e1703ee9d1e00048aa13078c062d7fcda86 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> >Date: Fri, 27 May 2016 11:55:09 +0100 >Subject: [PATCH] feeble attempt to fix this, at least doesn't crash > >Change-Id: I6cb69d904e357e934af9eb3e581fb0c9b56fa9b1 >--- > .../engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 16 ++++++++++------ > .../engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 2 +- > 2 files changed, 11 insertions(+), 7 deletions(-) > >diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx >index 6b7cd60..18eac8e 100644 >--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx >+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx >@@ -231,7 +231,7 @@ void OGLTransitionImpl::finish() > CHECK_GL_ERROR(); > } > >-void OGLTransitionImpl::prepare( double, double, double, double, double ) >+void OGLTransitionImpl::prepare( double, double, double, double, double, sal_Int32, sal_Int32 ) > { > } > >@@ -270,7 +270,7 @@ void OGLTransitionImpl::display( double nTime, sal_Int32 glLeavingSlideTex, sal_ > > CHECK_GL_ERROR(); > glBindVertexArray(m_nVertexArrayObject); >- prepare( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight ); >+ prepare( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight, glLeavingSlideTex, glEnteringSlideTex ); > > CHECK_GL_ERROR(); > displaySlides_( nTime, glLeavingSlideTex, glEnteringSlideTex, SlideWidthScale, SlideHeightScale ); >@@ -1138,10 +1138,10 @@ public: > {} > > private: >- virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; >+ virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override; > }; > >-void DiamondTransition::prepare( double nTime, double /* SlideWidth */, double /* SlideHeight */, double /* DispWidth */, double /* DispHeight */ ) >+void DiamondTransition::prepare( double nTime, double /* SlideWidth */, double /* SlideHeight */, double /* DispWidth */, double /* DispHeight */, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) > { > Primitive Slide1, Slide2; > >@@ -1175,6 +1175,8 @@ void DiamondTransition::prepare( double nTime, double /* SlideWidth */, double / > aLeavingSlidePrimitives.push_back (Slide2); > > setScene(TransitionScene(aLeavingSlidePrimitives, aEnteringSlidePrimitives)); >+ >+ OGLTransitionImpl::prepare(glLeavingSlideTex, glEnteringSlideTex); > } > > std::shared_ptr<OGLTransitionImpl> >@@ -1808,7 +1810,7 @@ public: > private: > virtual GLuint makeShader() const override; > virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override; >- virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ) override; >+ virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) override; > > glm::vec2 maCenter; > GLint maSlideRatioLocation = -1; >@@ -1831,7 +1833,9 @@ void RippleTransition::prepareTransition( sal_Int32, sal_Int32 ) > CHECK_GL_ERROR(); > } > >-void RippleTransition::prepare( double /* nTime */, double SlideWidth, double SlideHeight, double /* DispWidth */, double /* DispHeight */ ) >+void RippleTransition::prepare( double /* nTime */, double SlideWidth, double SlideHeight, >+ double /* DispWidth */, double /* DispHeight */, >+ sal_Int32 /* glLeavingSlideTex */, sal_Int32 /*glEnteringSlideTex*/ ) > { > if( maSlideRatioLocation != -1 ) > glUniform1f( maSlideRatioLocation, SlideWidth / SlideHeight ); >diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx >index bf2f1c1..2964f8c 100644 >--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx >+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx >@@ -176,7 +176,7 @@ private: > * > * Default implementation does nothing. > */ >- virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight ); >+ virtual void prepare( double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight, sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ); > > /** This function is called in display method to prepare the slides, scene, etc. > * >-- >2.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 97195
:
122012
|
122027
|
123210
|
123673
|
124234
|
125195
| 125326