slideshow: Don’t create the permTexture if the shaders don’t use it

Change-Id: I0aefe2130a85303213e247676d45546d9859cf62

1 files changed, 8 insertions, 8 deletions

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 529034fce81c..54033dfbe795 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -1525,16 +1525,16 @@ void ShaderTransition::impl_preparePermShader()
             CHECK_GL_ERROR();
         }
 
-        glActiveTexture(GL_TEXTURE1);
-        CHECK_GL_ERROR();
-        if( !m_nHelperTexture )
-            initPermTexture( &m_nHelperTexture );
-
-        glActiveTexture(GL_TEXTURE0);
-        CHECK_GL_ERROR();
-
         location = glGetUniformLocation( m_nProgramObject, "permTexture" );
         if( location != -1 ) {
+            glActiveTexture(GL_TEXTURE1);
+            CHECK_GL_ERROR();
+            if( !m_nHelperTexture )
+                initPermTexture( &m_nHelperTexture );
+
+            glActiveTexture(GL_TEXTURE0);
+            CHECK_GL_ERROR();
+
             glUniform1i( location, 1 );  // texture unit 1
             CHECK_GL_ERROR();
         }