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

List:       kde-commits
Subject:    [kde-workspace] kwin: kwin: dropping LOD bias
From:       Philipp Knechtges <philipp-dev () knechtges ! com>
Date:       2012-01-31 22:15:49
Message-ID: 20120131221549.05141A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit c6e38bced7284083b175bf1bc1fe3ab2092469c4 by Philipp Knechtges.
Committed on 07/01/2012 at 19:46.
Pushed by knechtges into branch 'master'.

kwin: dropping LOD bias

M  +0    -2    kwin/scene_opengl.h
M  +0    -10   kwin/scene_opengl_egl.cpp
M  +0    -19   kwin/scene_opengl_glx.cpp

http://commits.kde.org/kde-workspace/c6e38bced7284083b175bf1bc1fe3ab2092469=
c4

diff --git a/kwin/scene_opengl.h b/kwin/scene_opengl.h
index 957b6b7..57d9c0f 100644
--- a/kwin/scene_opengl.h
+++ b/kwin/scene_opengl.h
@@ -114,8 +114,6 @@ public:
     TexturePrivate();
     virtual ~TexturePrivate();
 =

-    virtual void bind();
-    virtual void unbind();
     virtual void release();
     virtual void onDamage();
 =

diff --git a/kwin/scene_opengl_egl.cpp b/kwin/scene_opengl_egl.cpp
index 6855133..5c3ed6e 100644
--- a/kwin/scene_opengl_egl.cpp
+++ b/kwin/scene_opengl_egl.cpp
@@ -300,13 +300,3 @@ void SceneOpenGL::TexturePrivate::onDamage()
     }
     GLTexturePrivate::onDamage();
 }
-
-void SceneOpenGL::TexturePrivate::bind()
-{
-    GLTexturePrivate::bind();
-}
-
-void SceneOpenGL::TexturePrivate::unbind()
-{
-    GLTexturePrivate::unbind();
-}
diff --git a/kwin/scene_opengl_glx.cpp b/kwin/scene_opengl_glx.cpp
index 5290ede..1818d7a 100644
--- a/kwin/scene_opengl_glx.cpp
+++ b/kwin/scene_opengl_glx.cpp
@@ -733,22 +733,3 @@ void SceneOpenGL::TexturePrivate::onDamage()
     }
     GLTexturePrivate::onDamage();
 }
-
-void SceneOpenGL::TexturePrivate::bind()
-{
-    GLTexturePrivate::bind();
-    if (hasGLVersion(1, 4, 0)) {
-        // Lod bias makes the trilinear-filtered texture look a bit sharper
-        glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0f);
-    }
-}
-
-void SceneOpenGL::TexturePrivate::unbind()
-{
-    if (hasGLVersion(1, 4, 0)) {
-        glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.0f);
-    }
-
-    GLTexturePrivate::unbind();
-}
-

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