From 9d01ed16be9a02e0d7d5e442482709fd0f2ad4d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Wed, 26 Nov 2014 21:40:11 +0100 Subject: [PATCH] Remove GLTexturePrivate::bind()/unbind() These virtual methods are not reimplemented anywhere. --- libkwineffects/kwingltexture.cpp | 16 ++++------------ libkwineffects/kwingltexture_p.h | 2 -- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libkwineffects/kwingltexture.cpp b/libkwineffects/kwingltexture.cpp index 2cf07fdb78..03e09be066 100644 --- a/libkwineffects/kwingltexture.cpp +++ b/libkwineffects/kwingltexture.cpp @@ -297,15 +297,12 @@ void GLTexture::discard() d_ptr = new GLTexturePrivate(); } -void GLTexturePrivate::bind() -{ - glBindTexture(m_target, m_texture); -} - void GLTexture::bind() { Q_D(GLTexture); - d->bind(); + + glBindTexture(d->m_target, d->m_texture); + if (d->m_markedDirty) { d->onDamage(); } @@ -340,15 +337,10 @@ void GLTexture::bind() } } -void GLTexturePrivate::unbind() -{ - glBindTexture(m_target, 0); -} - void GLTexture::unbind() { Q_D(GLTexture); - d->unbind(); + glBindTexture(d->m_target, 0); } void GLTexture::render(QRegion region, const QRect& rect, bool hardwareClipping) diff --git a/libkwineffects/kwingltexture_p.h b/libkwineffects/kwingltexture_p.h index 4a45299740..3cbb0bb12e 100644 --- a/libkwineffects/kwingltexture_p.h +++ b/libkwineffects/kwingltexture_p.h @@ -42,8 +42,6 @@ public: GLTexturePrivate(); virtual ~GLTexturePrivate(); - virtual void bind(); - virtual void unbind(); virtual void onDamage(); void updateMatrix();