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

kwin/blur: Optimize vertex uploads

Browse source 
Use the new GLVertexBuffer::map() interface.

Reviewed-by: Philipp Knechtges <philipp-dev@knechtges.com>
This commit is contained in:
Fredrik Höglund 2013-03-24 16:44:40 +01:00
parent 15dae59999
commit e1e997eda4
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
effects/blur/blur.cpp
View file

@ -229,21 +229,36 @@ QRegion BlurEffect::blurRegion(const EffectWindow *w) const
void BlurEffect::drawRegion(const QRegion &region)
{
const int vertexCount = region.rectCount() * 6;
if (vertices.size() < vertexCount)
vertices.resize(vertexCount);
int i = 0;
foreach (const QRect & r, region.rects()) {
vertices[i++] = QVector2D(r.x() + r.width(), r.y());
vertices[i++] = QVector2D(r.x(), r.y());
vertices[i++] = QVector2D(r.x(), r.y() + r.height());
vertices[i++] = QVector2D(r.x(), r.y() + r.height());
vertices[i++] = QVector2D(r.x() + r.width(), r.y() + r.height());
vertices[i++] = QVector2D(r.x() + r.width(), r.y());
}
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->reset();
vbo->setData(vertexCount, 2, (float*)vertices.constData(), (float*)vertices.constData());
QVector2D *map = (QVector2D *) vbo->map(vertexCount * sizeof(QVector2D));
foreach (const QRect &r, region.rects()) {
const QVector2D topLeft(r.x(), r.y());
const QVector2D topRight(r.x() + r.width(), r.y());
const QVector2D bottomLeft(r.x(), r.y() + r.height());
const QVector2D bottomRight(r.x() + r.width(), r.y() + r.height());
// First triangle
*(map++) = topRight;
*(map++) = topLeft;
*(map++) = bottomLeft;
// Second triangle
*(map++) = bottomLeft;
*(map++) = bottomRight;
*(map++) = topRight;
}
vbo->unmap();
const GLVertexAttrib layout[] = {
{ VA_Position, 2, GL_FLOAT, 0 },
{ VA_TexCoord, 2, GL_FLOAT, 0 }
};
vbo->setVertexCount(vertexCount);
vbo->setAttribLayout(layout, 2, sizeof(QVector2D));
vbo->render(GL_TRIANGLES);
}

1
effects/blur/blur.h
View file

@ -75,7 +75,6 @@ private:
private:
BlurShader *shader;
QVector<QVector2D> vertices;
GLRenderTarget *target;
GLTexture tex;
long net_wm_blur_region;