summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <emmanuel.peyrot@collabora.com>2015-12-09 21:39:31 +0000
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-12-12 09:31:51 +0100
commitfe9bcdc5a5989f5f56488d75809b040c3f484202 (patch)
tree51c69a581ea1440be15148a0c6ed63c6f94c543a /slideshow
parent1a4ce718c884a0a4568fb157617bc5fd5f71b9cd (diff)
opengl: Add Geometry Shader support to OpenGLHelper
This is the ground work for some later transitions in slideshow. Change-Id: Ib200cf7fabd579256a5255b0fb5d8c4accf7d24b (cherry picked from commit facfbeb5cbff191da956827bc37df7bc74ed0b81)
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 9bd4476f2a93..387e96e585fd 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -366,10 +366,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
aDeviceParams[1] >>= aVal;
mpContext = OpenGLContext::Create();
- mpContext->requestLegacyContext();
- if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) )
- return false;
+ if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) ) {
+ mpContext->requestLegacyContext();
+ if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) )
+ return false;
+ }
SAL_INFO("slideshow", "created the context");
CHECK_GL_ERROR();