diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2016-01-20 21:04:37 +0000 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2016-01-20 22:45:04 +0100 |
| commit | 29bd6961a23dd44bcf315cacac1189282d87fc9f (patch) | |
| tree | 19b39ff1574f001d0d62a5aef06e90066e656fc8 /slideshow/source | |
| parent | 24b9f873a691f4cfe4b3fa2c2a48f79a41a12417 (diff) | |
slideshow: Change quads into cubes in the Vortex transition
This makes Vortex require OpenGL 3.2 instead of 2.1.
Change-Id: I9438a37c2cf75e58eafc807ad1abaa22acb231b1
Diffstat (limited to 'slideshow/source')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 19c92b705f05..7816ca9fca69 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -1586,7 +1586,7 @@ void VortexTransition::prepare( double, double, double, double, double ) GLuint VortexTransition::makeShader() const { - return OpenGLHelper::LoadShaders( "vortexVertexShader", "basicFragmentShader" ); + return OpenGLHelper::LoadShaders( "vortexVertexShader", "basicFragmentShader", "vortexGeometryShader" ); } void VortexTransition::prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32 glEnteringSlideTex ) @@ -1690,6 +1690,7 @@ std::shared_ptr<OGLTransitionImpl> makeVortex() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; + aSettings.mnRequiredGLVersion = 3.2f; return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, NY); } |