From 60f6c7578b2ba9e78d1aa9589b315aec6b489a16 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 28 Nov 2012 11:58:46 +0100
Subject: 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
---
 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'slideshow')

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
 }
 
-- 
cgit