From f21ef431c44503b92a19e2ca7e54c2d93b574aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= <fredrik@kde.org>
Date: Thu, 13 Sep 2012 22:49:53 +0200
Subject: [PATCH] kwin: Don't enable/disable texturing when using shaders

This state has no affect on the programmable pipeline.
---
 libkwineffects/kwingltexture.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp
index e060643cfe..a3fbec9d02 100644
--- a/libkwineffects/kwingltexture.cpp
+++ b/libkwineffects/kwingltexture.cpp
@@ -240,7 +240,8 @@ void GLTexture::discard()
 void GLTexturePrivate::bind()
 {
 #ifndef KWIN_HAVE_OPENGLES
-    glEnable(m_target);
+    if (!ShaderManager::instance()->isValid())
+        glEnable(m_target);
 #endif
     glBindTexture(m_target, m_texture);
 }
@@ -287,7 +288,8 @@ void GLTexturePrivate::unbind()
 {
     glBindTexture(m_target, 0);
 #ifndef KWIN_HAVE_OPENGLES
-    glDisable(m_target);
+    if (!ShaderManager::instance()->isValid())
+        glDisable(m_target);
 #endif
 }