diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 149e4445f5..1ddb5a3a66 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -1116,36 +1116,6 @@ void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQu vbo->render(region, primitiveType, m_hardwareClipping); } -GLTexture *SceneOpenGL::Window::textureForType(SceneOpenGL::Window::TextureType type) -{ - GLTexture *tex = NULL; - OpenGLPaintRedirector *redirector = NULL; - - if (type != Content && type != Shadow) { - if (toplevel->isClient()) { - Client *client = static_cast(toplevel); - redirector = static_cast(client->decorationPaintRedirector()); - } else if (toplevel->isDeleted()) { - Deleted *deleted = static_cast(toplevel); - redirector = static_cast(deleted->decorationPaintRedirector()); - } - } - - switch(type) { - case Content: - tex = s_frameTexture; - break; - - case Decoration: - tex = redirector ? redirector->decorationTexture() : 0; - break; - - case Shadow: - tex = static_cast(m_shadow)->shadowTexture(); - } - return tex; -} - WindowPixmap* SceneOpenGL::Window::createWindowPixmap() { return new OpenGLWindowPixmap(this, m_scene); diff --git a/scene_opengl.h b/scene_opengl.h index f8fdb8a293..f39007cf27 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -233,14 +233,6 @@ protected: **/ virtual void restoreStates(TextureType type, qreal opacity, qreal brightness, qreal saturation) = 0; - /** - * @brief Returns the texture for the given @p type. - * - * @param type The Texture Type for which the texture should be retrieved - * @return :GLTexture* the texture - **/ - GLTexture *textureForType(TextureType type); - void paintDecorations(const WindowPaintData &data, const QRegion ®ion); protected: