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

ResizeEffect uses shared VBO

Browse source
This commit is contained in:
Martin Gräßlin 2010-12-11 15:58:52 +01:00
parent 17032c66f8
commit 6cb3b95cc1
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
effects/resize/resize.cpp
View file

@ -38,27 +38,12 @@ KWIN_EFFECT( resize, ResizeEffect )
ResizeEffect::ResizeEffect()
: m_active( false )
, m_resizeWindow( 0 )
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
, m_vbo( 0 )
#endif
{
reconfigure( ReconfigureAll );
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
if (effects->compositingType() == OpenGLCompositing) {
m_vbo = new GLVertexBuffer(GLVertexBuffer::Stream);
m_vbo->setUseColor(true);
if (ShaderManager::instance()->isValid()) {
m_vbo->setUseShader(true);
}
}
#endif
}
ResizeEffect::~ResizeEffect()
{
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
delete m_vbo;
#endif
}
void ResizeEffect::prePaintScreen( ScreenPrePaintData& data, int time )
@ -104,13 +89,17 @@ void ResizeEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
#ifndef KWIN_HAVE_OPENGLES
glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT );
#endif
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->reset();
vbo->setUseColor(true);
if (ShaderManager::instance()->isValid()) {
ShaderManager::instance()->pushShader(ShaderManager::ColorShader);
vbo->setUseShader(true);
}
glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
color.setAlphaF(alpha);
m_vbo->setColor(color);
vbo->setColor(color);
QVector<float> verts;
verts.reserve(paintRegion.rects().count()*12);
foreach( const QRect &r, paintRegion.rects() ) {
@ -121,8 +110,8 @@ void ResizeEffect::paintWindow( EffectWindow* w, int mask, QRegion region, Windo
verts << r.x() + r.width() << r.y() + r.height();
verts << r.x() + r.width() << r.y();
}
m_vbo->setData(verts.count()/2, 2, verts.data(), NULL);
m_vbo->render(GL_TRIANGLES);
vbo->setData(verts.count()/2, 2, verts.data(), NULL);
vbo->render(GL_TRIANGLES);
if (ShaderManager::instance()->isValid()) {
ShaderManager::instance()->popShader();
}

4
effects/resize/resize.h
View file

@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin
{
class GLVertexBuffer;
class ResizeEffect
: public Effect
@ -47,9 +46,6 @@ class ResizeEffect
int m_features;
EffectWindow* m_resizeWindow;
QRect m_currentGeometry, m_originalGeometry;
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
GLVertexBuffer *m_vbo;
#endif
};
}