From fc56ac28fb9ed7197bccdef82d7ca037d05067f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B6glund?= Date: Sun, 13 Apr 2014 20:43:21 +0200 Subject: [PATCH] Remove SceneOpenGL::Texture::update() The default implementation is a no-op, and none of the current backends reimplement it. --- scene_opengl.cpp | 14 -------------- scene_opengl.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/scene_opengl.cpp b/scene_opengl.cpp index 1b2dd37c9b..7be14e284b 100644 --- a/scene_opengl.cpp +++ b/scene_opengl.cpp @@ -793,12 +793,6 @@ void SceneOpenGL::Texture::findTarget() d->findTarget(); } -bool SceneOpenGL::Texture::update(const QRegion &damage) -{ - Q_D(Texture); - return d->update(damage); -} - //**************************************** // SceneOpenGL::Texture //**************************************** @@ -810,12 +804,6 @@ SceneOpenGL::TexturePrivate::~TexturePrivate() { } -bool SceneOpenGL::TexturePrivate::update(const QRegion &damage) -{ - Q_UNUSED(damage) - return true; -} - //**************************************** // SceneOpenGL::Window //**************************************** @@ -1201,11 +1189,9 @@ bool OpenGLWindowPixmap::bind() { if (!m_texture->isNull()) { if (!toplevel()->damage().isEmpty()) { - const bool success = m_texture->update(toplevel()->damage()); // mipmaps need to be updated m_texture->setDirty(); toplevel()->resetDamage(); - return success; } return true; } diff --git a/scene_opengl.h b/scene_opengl.h index 0d94855a69..04c91df4ea 100644 --- a/scene_opengl.h +++ b/scene_opengl.h @@ -146,7 +146,6 @@ public: virtual void findTarget() = 0; virtual bool loadTexture(xcb_pixmap_t pix, const QSize &size, int depth) = 0; virtual OpenGLBackend *backend() = 0; - virtual bool update(const QRegion &damage); protected: TexturePrivate(); @@ -167,7 +166,6 @@ public: using GLTexture::load; virtual void discard(); - bool update(const QRegion &damage); protected: void findTarget();