kwin: Don't enable/disable texturing when using shaders
This state has no affect on the programmable pipeline.
This commit is contained in:
parent
faf27f481e
commit
f21ef431c4
1 changed files with 4 additions and 2 deletions
|
@ -240,6 +240,7 @@ void GLTexture::discard()
|
||||||
void GLTexturePrivate::bind()
|
void GLTexturePrivate::bind()
|
||||||
{
|
{
|
||||||
#ifndef KWIN_HAVE_OPENGLES
|
#ifndef KWIN_HAVE_OPENGLES
|
||||||
|
if (!ShaderManager::instance()->isValid())
|
||||||
glEnable(m_target);
|
glEnable(m_target);
|
||||||
#endif
|
#endif
|
||||||
glBindTexture(m_target, m_texture);
|
glBindTexture(m_target, m_texture);
|
||||||
|
@ -287,6 +288,7 @@ void GLTexturePrivate::unbind()
|
||||||
{
|
{
|
||||||
glBindTexture(m_target, 0);
|
glBindTexture(m_target, 0);
|
||||||
#ifndef KWIN_HAVE_OPENGLES
|
#ifndef KWIN_HAVE_OPENGLES
|
||||||
|
if (!ShaderManager::instance()->isValid())
|
||||||
glDisable(m_target);
|
glDisable(m_target);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue