yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove SceneOpenGL::Texture::load(QImage)

Browse source 
It's never called.
This commit is contained in:
Fredrik Höglund 2014-04-13 20:41:51 +02:00
parent ff096e532f
commit 49c8827345
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene_opengl.cpp
View file

@ -787,13 +787,6 @@ bool SceneOpenGL::Texture::load(xcb_pixmap_t pix, const QSize &size, int depth)
return d->loadTexture(pix, size, depth); return d->loadTexture(pix, size, depth);
} }
bool SceneOpenGL::Texture::load(const QImage& image, GLenum target)
{
if (image.isNull())
return false;
return load(QPixmap::fromImage(image), target);
}
bool SceneOpenGL::Texture::load(const QPixmap& pixmap, GLenum target) bool SceneOpenGL::Texture::load(const QPixmap& pixmap, GLenum target)
{ {
if (pixmap.isNull()) if (pixmap.isNull())

1
scene_opengl.h
View file

@ -166,7 +166,6 @@ public:
Texture & operator = (const Texture& tex); Texture & operator = (const Texture& tex);
using GLTexture::load; using GLTexture::load;
virtual bool load(const QImage& image, GLenum target = GL_TEXTURE_2D);
virtual bool load(const QPixmap& pixmap, GLenum target = GL_TEXTURE_2D); virtual bool load(const QPixmap& pixmap, GLenum target = GL_TEXTURE_2D);
virtual void discard(); virtual void discard();
bool update(const QRegion &damage); bool update(const QRegion &damage);