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

Remove SceneOpenGL::createTexture(QPixmap)

Browse source 
...and associated code.

It is no longer used.
This commit is contained in:
Fredrik Höglund 2014-11-26 21:29:39 +01:00
parent 34f1408134
commit fa52af4765
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene_opengl.cpp
View file

@ -756,11 +756,6 @@ SceneOpenGL::Texture *SceneOpenGL::createTexture()
return new Texture(m_backend);
}
SceneOpenGL::Texture *SceneOpenGL::createTexture(const QPixmap &pix, GLenum target)
{
return new Texture(m_backend, pix, target);
}
bool SceneOpenGL::viewportLimitsMatched(const QSize &size) const {
GLint limit[2];
glGetIntegerv(GL_MAX_VIEWPORT_DIMS, limit);
@ -1050,12 +1045,6 @@ SceneOpenGL::Texture::Texture(OpenGLBackend *backend)
{
}
SceneOpenGL::Texture::Texture(OpenGLBackend *backend, const QPixmap &pix, GLenum target)
: GLTexture(*backend->createBackendTexture(this))
{
GLTexture::load(pix.toImage(), target);
}
SceneOpenGL::Texture::~Texture()
{
}

3
scene_opengl.h
View file

@ -74,7 +74,6 @@ public:
* @return :SceneOpenGL::Texture*
**/
Texture *createTexture();
Texture *createTexture(const QPixmap& pix, GLenum target = GL_TEXTURE_2D);
#ifndef KWIN_HAVE_OPENGLES
/**
@ -165,12 +164,10 @@ class SceneOpenGL::Texture
{
public:
Texture(OpenGLBackend *backend);
Texture(OpenGLBackend *backend, const QPixmap& pix, GLenum target = GL_TEXTURE_2D);
virtual ~Texture();
Texture & operator = (const Texture& tex);
using GLTexture::load;
virtual void discard();
protected: