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

Remove SceneOpenGL::Texture::findTarget()

Browse source 
It is no longer used.
This commit is contained in:
Fredrik Höglund 2014-04-13 20:53:10 +02:00
parent 59212e3a79
commit 4f9ea5335d
8 changed files with 0 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
egl_wayland_backend.cpp
View file

@ -380,13 +380,6 @@ OpenGLBackend *EglWaylandTexture::backend()
return m_backend;
}
void EglWaylandTexture::findTarget()
{
if (m_target != GL_TEXTURE_2D) {
m_target = GL_TEXTURE_2D;
}
}
bool EglWaylandTexture::loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual)
{
Q_UNUSED(visual)

1
egl_wayland_backend.h
View file

@ -102,7 +102,6 @@ class EglWaylandTexture : public SceneOpenGL::TexturePrivate
{
public:
virtual ~EglWaylandTexture();
virtual void findTarget();
virtual bool loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual) override;
virtual OpenGLBackend *backend();
virtual bool update(const QRegion &damage);

7
eglonxbackend.cpp
View file

@ -459,13 +459,6 @@ OpenGLBackend *EglTexture::backend()
return m_backend;
}
void EglTexture::findTarget()
{
if (m_target != GL_TEXTURE_2D) {
m_target = GL_TEXTURE_2D;
}
}
bool EglTexture::loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual)
{
Q_UNUSED(visual)

1
eglonxbackend.h
View file

@ -69,7 +69,6 @@ class EglTexture : public SceneOpenGL::TexturePrivate
public:
virtual ~EglTexture();
virtual void onDamage();
virtual void findTarget();
virtual bool loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual) override;
virtual OpenGLBackend *backend();

32
glxbackend.cpp
View file

@ -750,38 +750,6 @@ void GlxTexture::onDamage()
GLTexturePrivate::onDamage();
}
void GlxTexture::findTarget()
{
unsigned int new_target = 0;
if (glXQueryDrawable && m_glxpixmap != None)
glXQueryDrawable(display(), m_glxpixmap, GLX_TEXTURE_TARGET_EXT, &new_target);
// HACK: this used to be a hack for Xgl.
// without this hack the NVIDIA blob aborts when trying to bind a texture from
// a pixmap icon
if (new_target == 0) {
if (GLTexture::NPOTTextureSupported() ||
(isPowerOfTwo(m_size.width()) && isPowerOfTwo(m_size.height()))) {
new_target = GLX_TEXTURE_2D_EXT;
} else {
new_target = GLX_TEXTURE_RECTANGLE_EXT;
}
}
switch(new_target) {
case GLX_TEXTURE_2D_EXT:
m_target = GL_TEXTURE_2D;
m_scale.setWidth(1.0f / m_size.width());
m_scale.setHeight(1.0f / m_size.height());
break;
case GLX_TEXTURE_RECTANGLE_EXT:
m_target = GL_TEXTURE_RECTANGLE_ARB;
m_scale.setWidth(1.0f);
m_scale.setHeight(1.0f);
break;
default:
abort();
}
}
bool GlxTexture::loadTexture(xcb_pixmap_t pixmap, const QSize &size, xcb_visualid_t visual)
{
if (pixmap == XCB_NONE || size.isEmpty() || visual == XCB_NONE)

1
glxbackend.h
View file

@ -92,7 +92,6 @@ class GlxTexture : public SceneOpenGL::TexturePrivate
public:
virtual ~GlxTexture();
virtual void onDamage();
virtual void findTarget();
virtual bool loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual) override;
virtual OpenGLBackend *backend();

6
scene_opengl.cpp
View file

@ -788,12 +788,6 @@ bool SceneOpenGL::Texture::load(xcb_pixmap_t pix, const QSize &size,
return d->loadTexture(pix, size, visual);
}
void SceneOpenGL::Texture::findTarget()
{
Q_D(Texture);
d->findTarget();
}
//****************************************
// SceneOpenGL::Texture
//****************************************

2
scene_opengl.h
View file

@ -143,7 +143,6 @@ class SceneOpenGL::TexturePrivate
public:
virtual ~TexturePrivate();
virtual void findTarget() = 0;
virtual bool loadTexture(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t visual) = 0;
virtual OpenGLBackend *backend() = 0;
@ -168,7 +167,6 @@ public:
virtual void discard();
protected:
void findTarget();
virtual bool load(xcb_pixmap_t pix, const QSize &size, xcb_visualid_t);
Texture(TexturePrivate& dd);