[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin: kwin: cleaning up the GLTexture API
From:       Philipp Knechtges <philipp-dev () knechtges ! com>
Date:       2012-01-31 22:15:49
Message-ID: 20120131221549.0EA08A60C6 () git ! kde ! org
[Download RAW message or body]

Git commit 3296095e8b4514427863c732e2b46e0412164d08 by Philipp Knechtges.
Committed on 07/01/2012 at 22:26.
Pushed by knechtges into branch 'master'.

kwin: cleaning up the GLTexture API

M  +0    -24   kwin/libkwineffects/kwingltexture.cpp
M  +2    -11   kwin/libkwineffects/kwingltexture.h
M  +0    -1    kwin/libkwineffects/kwingltexture_p.h
M  +0    -1    kwin/scene_opengl.h
M  +0    -4    kwin/scene_opengl_egl.cpp
M  +0    -5    kwin/scene_opengl_glx.cpp

http://commits.kde.org/kde-workspace/3296095e8b4514427863c732e2b46e0412164d08

diff --git a/kwin/libkwineffects/kwingltexture.cpp b/kwin/libkwineffects/kwingltexture.cpp
index 9e577e8..50a0810 100644
--- a/kwin/libkwineffects/kwingltexture.cpp
+++ b/kwin/libkwineffects/kwingltexture.cpp
@@ -371,19 +371,6 @@ bool GLTexture::isDirty() const
     return d->m_markedDirty;
 }
 
-void GLTexture::setTexture(GLuint texture)
-{
-    discard();
-    Q_D(GLTexture);
-    d->m_texture = texture;
-}
-
-void GLTexture::setTarget(GLenum target)
-{
-    Q_D(GLTexture);
-    d->m_target = target;
-}
-
 void GLTexture::setFilter(GLenum filter)
 {
     Q_D(GLTexture);
@@ -516,15 +503,4 @@ bool GLTexture::saturationSupported()
     return GLTexturePrivate::sSaturationSupported;
 }
 
-void GLTexture::release()
-{
-    Q_D(GLTexture);
-    d->release();
-}
-
-void GLTexturePrivate::release()
-{
-    // nothing to do because we are not bound to any specific data
-}
-
 } // namespace KWin
diff --git a/kwin/libkwineffects/kwingltexture.h b/kwin/libkwineffects/kwingltexture.h
index b913eca..ed24349 100644
--- a/kwin/libkwineffects/kwingltexture.h
+++ b/kwin/libkwineffects/kwingltexture.h
@@ -72,30 +72,21 @@ public:
     virtual void discard();
     void bind();
     void unbind();
-    /**
-     * Release the data which is bound to the texture.
-     * @since 4.8
-     **/
-    void release();
     void render(QRegion region, const QRect& rect);
 
     GLuint texture() const;
     GLenum target() const;
     GLenum filter() const;
-    virtual bool isDirty() const;
-    void setTexture(GLuint texture);
-    void setTarget(GLenum target);
+    bool isDirty() const;
     void setFilter(GLenum filter);
     void setWrapMode(GLenum mode);
-    virtual void setDirty();
+    void setDirty();
 
     static bool NPOTTextureSupported();
     static bool framebufferObjectSupported();
     static bool saturationSupported();
 
 protected:
-    QImage convertToGLFormat(const QImage& img) const;
-
     QExplicitlySharedDataPointer<GLTexturePrivate> d_ptr;
     GLTexture(GLTexturePrivate& dd);
 
diff --git a/kwin/libkwineffects/kwingltexture_p.h b/kwin/libkwineffects/kwingltexture_p.h
index 27c14db..9675ec6 100644
--- a/kwin/libkwineffects/kwingltexture_p.h
+++ b/kwin/libkwineffects/kwingltexture_p.h
@@ -41,7 +41,6 @@ public:
 
     virtual void bind();
     virtual void unbind();
-    virtual void release();
     virtual void onDamage();
 
     QImage convertToGLFormat(const QImage& img) const;
diff --git a/kwin/scene_opengl.h b/kwin/scene_opengl.h
index 57d9c0f..ca6d0cf 100644
--- a/kwin/scene_opengl.h
+++ b/kwin/scene_opengl.h
@@ -114,7 +114,6 @@ public:
     TexturePrivate();
     virtual ~TexturePrivate();
 
-    virtual void release();
     virtual void onDamage();
 
 #ifndef KWIN_HAVE_OPENGLES
diff --git a/kwin/scene_opengl_egl.cpp b/kwin/scene_opengl_egl.cpp
index 5c3ed6e..9868006 100644
--- a/kwin/scene_opengl_egl.cpp
+++ b/kwin/scene_opengl_egl.cpp
@@ -248,10 +248,6 @@ void SceneOpenGL::Texture::findTarget()
     d->m_target = GL_TEXTURE_2D;
 }
 
-void SceneOpenGL::TexturePrivate::release()
-{
-}
-
 bool SceneOpenGL::Texture::load(const Pixmap& pix, const QSize& size,
                                 int depth, QRegion region)
 {
diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
index 1818d7a..1c6b235 100644
--- a/kwin/scene_opengl_glx.cpp
+++ b/kwin/scene_opengl_glx.cpp
@@ -607,11 +607,6 @@ SceneOpenGL::TexturePrivate::TexturePrivate()
 
 SceneOpenGL::TexturePrivate::~TexturePrivate()
 {
-    release();
-}
-
-void SceneOpenGL::TexturePrivate::release()
-{
     if (m_glxpixmap != None) {
         if (!options->glStrictBinding) {
             glXReleaseTexImageEXT(display(), m_glxpixmap, GLX_FRONT_LEFT_EXT);
[prev in list] [next in list] [prev in thread] [next in thread]