summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-11-28 11:58:46 +0100
committerDavid Tardon <dtardon@redhat.com>2012-11-28 12:14:20 +0100
commit60f6c7578b2ba9e78d1aa9589b315aec6b489a16 (patch)
tree3dc638ba5edc808c0543dd7ab470d8574f427c61 /slideshow
parent5ff406634d41b16db2c238d284d7fd7cae66299e (diff)
fix first run of shader-using 3D transitions
The slideshow engine emits viewChanged() immediately after the transition has been initialized. Because the ShaderTransition data were not fully reset in finishTransition_, no transition texture would be generated on the re-initialization in viewChanged(), thus there would be no transition on the first slide. Change-Id: I04fef9a6c09537995d83889be2fe15569a1ddc2c
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 491381cf3124..efdf7bea5ae6 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -1449,6 +1449,11 @@ void ShaderTransition::finishTransition_()
OGLShaders::glDeleteProgram( m_nProgramObject );
m_nProgramObject = 0;
}
+ if ( m_nHelperTexture )
+ {
+ glDeleteTextures( 1, &m_nHelperTexture );
+ m_nHelperTexture = 0;
+ }
#endif
}