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

Change-Id: I0aefe2130a85303213e247676d45546d9859cf62

slideshow: Don’t create the permTexture if the shaders don’t use it
Change-Id: I0aefe2130a85303213e247676d45546d9859cf62
ba02afad · Emmanuel Gil Peyrot · Tor Lillqvist · f41358a7 · ba02afad
Kaydet (Commit) ba02afad authored Kas 19, 2015 tarafından Emmanuel Gil Peyrot Kaydeden (comit) Tor Lillqvist Kas 19, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

OGLTrans_TransitionImpl.cxx ...ource/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +8 -8

No files found.
--- 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();
        }