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

SnapHelper uses shared VBO

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

25
effects/snaphelper/snaphelper.cpp
View file

@ -32,21 +32,9 @@ KWIN_EFFECT_SUPPORTED( snaphelper, SnapHelperEffect::supported() )
SnapHelperEffect::SnapHelperEffect() SnapHelperEffect::SnapHelperEffect()
: m_active( false ) : m_active( false )
, m_window( NULL ) , m_window( NULL )
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
, m_vbo( 0 )
#endif
{ {
m_timeline.setCurveShape( TimeLine::LinearCurve ); m_timeline.setCurveShape( TimeLine::LinearCurve );
reconfigure( ReconfigureAll ); 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
/*if( effects->compositingType() == XRenderCompositing ) /*if( effects->compositingType() == XRenderCompositing )
{ {
@ -61,9 +49,6 @@ SnapHelperEffect::~SnapHelperEffect()
{ {
//if( effects->compositingType() == XRenderCompositing ) //if( effects->compositingType() == XRenderCompositing )
// XFreeGC( display(), m_gc ); // XFreeGC( display(), m_gc );
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
delete m_vbo;
#endif
} }
void SnapHelperEffect::reconfigure( ReconfigureFlags ) void SnapHelperEffect::reconfigure( ReconfigureFlags )
@ -98,8 +83,12 @@ void SnapHelperEffect::postPaintScreen()
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT ); glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT );
#endif #endif
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->reset();
vbo->setUseColor(true);
if (ShaderManager::instance()->isValid()) { if (ShaderManager::instance()->isValid()) {
ShaderManager::instance()->pushShader(ShaderManager::ColorShader); ShaderManager::instance()->pushShader(ShaderManager::ColorShader);
vbo->setUseShader(true);
} }
glEnable( GL_BLEND ); glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
@ -109,7 +98,7 @@ void SnapHelperEffect::postPaintScreen()
color.setGreenF(0.5); color.setGreenF(0.5);
color.setBlueF(0.5); color.setBlueF(0.5);
color.setAlphaF(m_timeline.value() * 0.5); color.setAlphaF(m_timeline.value() * 0.5);
m_vbo->setColor(color); vbo->setColor(color);
glLineWidth( 4.0 ); glLineWidth( 4.0 );
QVector<float> verts; QVector<float> verts;
verts.reserve(effects->numScreens()*24); verts.reserve(effects->numScreens()*24);
@ -137,8 +126,8 @@ void SnapHelperEffect::postPaintScreen()
verts << midX - halfWidth << midY + halfHeight - 2; verts << midX - halfWidth << midY + halfHeight - 2;
verts << midX - halfWidth << midY - halfHeight - 2; verts << midX - halfWidth << midY - halfHeight - 2;
} }
m_vbo->setData(verts.count()/2, 2, verts.data(), NULL); vbo->setData(verts.count()/2, 2, verts.data(), NULL);
m_vbo->render(GL_LINES); vbo->render(GL_LINES);
if (ShaderManager::instance()->isValid()) { if (ShaderManager::instance()->isValid()) {
ShaderManager::instance()->popShader(); ShaderManager::instance()->popShader();
} }

5
effects/snaphelper/snaphelper.h
View file

@ -25,8 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin namespace KWin
{ {
class GLShader;
class GLVertexBuffer;
class SnapHelperEffect class SnapHelperEffect
: public Effect : public Effect
@ -49,9 +47,6 @@ class SnapHelperEffect
EffectWindow* m_window; EffectWindow* m_window;
TimeLine m_timeline; TimeLine m_timeline;
//GC m_gc; //GC m_gc;
#ifdef KWIN_HAVE_OPENGL_COMPOSITING
GLVertexBuffer *m_vbo;
#endif
}; };
} // namespace } // namespace