From 29bd6961a23dd44bcf315cacac1189282d87fc9f Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 20 Jan 2016 21:04:37 +0000 Subject: slideshow: Change quads into cubes in the Vortex transition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes Vortex require OpenGL 3.2 instead of 2.1. Change-Id: I9438a37c2cf75e58eafc807ad1abaa22acb231b1 --- slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'slideshow/source/engine/OGLTrans') 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 makeVortex() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; + aSettings.mnRequiredGLVersion = 3.2f; return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, NY); } -- cgit