diff options
| author | Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> | 2015-11-23 21:53:21 +0000 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-11-23 23:06:39 +0100 |
| commit | b8eff3afb4a4b313c9be668951ae2cb458cd6a4a (patch) | |
| tree | b2c48ba9404ef4ad0baf5272a471fffa72ec0084 /slideshow | |
| parent | 2a81e30c596a0cd253093d338368b3aad11eb166 (diff) | |
slideshow: Fix the baseline version, we now require OpenGL 2.1
With ReflectionTransition requiring 3.0 instead.
Change-Id: I9497dab91017d1d81a6a5a369524849ce5774694
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 6 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 3f4f1f69bdb4..a9991f144309 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -591,6 +591,7 @@ std::shared_ptr<OGLTransitionImpl> makeTurnAround() { Primitive Slide; TransitionSettings aSettings; + aSettings.mnRequiredGLVersion = 3.0; Slide.pushTriangle(glm::vec2(0,0),glm::vec2(1,0),glm::vec2(0,1)); Slide.pushTriangle(glm::vec2(1,0),glm::vec2(0,1),glm::vec2(1,1)); @@ -755,6 +756,7 @@ std::shared_ptr<OGLTransitionImpl> makeRochade() { Primitive Slide; TransitionSettings aSettings; + aSettings.mnRequiredGLVersion = 3.0; double w, h; @@ -1407,7 +1409,6 @@ std::shared_ptr<OGLTransitionImpl> makeStatic() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; - aSettings.mnRequiredGLVersion = 2.0; return makeStaticNoiseTransition(aLeavingSlide, aEnteringSlide, aSettings); } @@ -1458,7 +1459,6 @@ std::shared_ptr<OGLTransitionImpl> makeDissolve() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; - aSettings.mnRequiredGLVersion = 2.0; return makeDissolveTransition(aLeavingSlide, aEnteringSlide, aSettings); } @@ -1607,7 +1607,6 @@ std::shared_ptr<OGLTransitionImpl> makeVortex() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; - aSettings.mnRequiredGLVersion = 2.0; return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, NY); } @@ -1679,7 +1678,6 @@ std::shared_ptr<OGLTransitionImpl> makeRipple() TransitionSettings aSettings; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; - aSettings.mnRequiredGLVersion = 2.0; return makeRippleTransition(aLeavingSlide, aEnteringSlide, aSettings); } diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx index 1d58348b7845..f1a595efb025 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx @@ -48,7 +48,7 @@ struct TransitionSettings TransitionSettings() : mbUseMipMapLeaving( true ), mbUseMipMapEntering( true ), - mnRequiredGLVersion( 1.0 ) + mnRequiredGLVersion( 2.1 ) { } |