Kaydet (Commit) b8eff3af authored tarafından Emmanuel Gil Peyrot's avatar Emmanuel Gil Peyrot Kaydeden (comit) Tomaž Vajngerl

slideshow: Fix the baseline version, we now require OpenGL 2.1

With ReflectionTransition requiring 3.0 instead.

Change-Id: I9497dab91017d1d81a6a5a369524849ce5774694
üst 2a81e30c
...@@ -591,6 +591,7 @@ std::shared_ptr<OGLTransitionImpl> makeTurnAround() ...@@ -591,6 +591,7 @@ std::shared_ptr<OGLTransitionImpl> makeTurnAround()
{ {
Primitive Slide; Primitive Slide;
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mnRequiredGLVersion = 3.0;
Slide.pushTriangle(glm::vec2(0,0),glm::vec2(1,0),glm::vec2(0,1)); 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)); Slide.pushTriangle(glm::vec2(1,0),glm::vec2(0,1),glm::vec2(1,1));
...@@ -755,6 +756,7 @@ std::shared_ptr<OGLTransitionImpl> makeRochade() ...@@ -755,6 +756,7 @@ std::shared_ptr<OGLTransitionImpl> makeRochade()
{ {
Primitive Slide; Primitive Slide;
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mnRequiredGLVersion = 3.0;
double w, h; double w, h;
...@@ -1407,7 +1409,6 @@ std::shared_ptr<OGLTransitionImpl> makeStatic() ...@@ -1407,7 +1409,6 @@ std::shared_ptr<OGLTransitionImpl> makeStatic()
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
aSettings.mnRequiredGLVersion = 2.0;
return makeStaticNoiseTransition(aLeavingSlide, aEnteringSlide, aSettings); return makeStaticNoiseTransition(aLeavingSlide, aEnteringSlide, aSettings);
} }
...@@ -1458,7 +1459,6 @@ std::shared_ptr<OGLTransitionImpl> makeDissolve() ...@@ -1458,7 +1459,6 @@ std::shared_ptr<OGLTransitionImpl> makeDissolve()
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
aSettings.mnRequiredGLVersion = 2.0;
return makeDissolveTransition(aLeavingSlide, aEnteringSlide, aSettings); return makeDissolveTransition(aLeavingSlide, aEnteringSlide, aSettings);
} }
...@@ -1607,7 +1607,6 @@ std::shared_ptr<OGLTransitionImpl> makeVortex() ...@@ -1607,7 +1607,6 @@ std::shared_ptr<OGLTransitionImpl> makeVortex()
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
aSettings.mnRequiredGLVersion = 2.0;
return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, NY); return makeVortexTransition(aLeavingSlide, aEnteringSlide, aSettings, NX, NY);
} }
...@@ -1679,7 +1678,6 @@ std::shared_ptr<OGLTransitionImpl> makeRipple() ...@@ -1679,7 +1678,6 @@ std::shared_ptr<OGLTransitionImpl> makeRipple()
TransitionSettings aSettings; TransitionSettings aSettings;
aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false; aSettings.mbUseMipMapLeaving = aSettings.mbUseMipMapEntering = false;
aSettings.mnRequiredGLVersion = 2.0;
return makeRippleTransition(aLeavingSlide, aEnteringSlide, aSettings); return makeRippleTransition(aLeavingSlide, aEnteringSlide, aSettings);
} }
......
...@@ -48,7 +48,7 @@ struct TransitionSettings ...@@ -48,7 +48,7 @@ struct TransitionSettings
TransitionSettings() : TransitionSettings() :
mbUseMipMapLeaving( true ), mbUseMipMapLeaving( true ),
mbUseMipMapEntering( true ), mbUseMipMapEntering( true ),
mnRequiredGLVersion( 1.0 ) mnRequiredGLVersion( 2.1 )
{ {
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment