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

kwin: Use the new map() interface in makeDecorationArrays()

Browse source 
Write the vertex data directly into the buffer object, instead of
allocating two temporary arrays, copying the data into them, and
then copying the data from arrays into the buffer object.
This commit is contained in:
Fredrik Höglund 2012-09-18 22:24:01 +02:00
parent de4b7e8db1
commit 7a00648195
1 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
scene_opengl.cpp
View file

@ -47,6 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
#include <stddef.h>
// turns on checks for opengl errors in various places (for easier finding of them) // turns on checks for opengl errors in various places (for easier finding of them)
// normally only few of them are enabled // normally only few of them are enabled
@ -1263,39 +1264,47 @@ void SceneOpenGL::Window::paintShadow(const QRegion &region, const WindowPaintDa
void SceneOpenGL::Window::makeDecorationArrays(const WindowQuadList &quads, const QRect &rect, GLTexture *texture) const void SceneOpenGL::Window::makeDecorationArrays(const WindowQuadList &quads, const QRect &rect, GLTexture *texture) const
{ {
QVector<float> vertices;
QVector<float> texcoords;
vertices.reserve(quads.count() * 6 * 2);
texcoords.reserve(quads.count() * 6 * 2);
// Since we know that the texture matrix just scales and translates
// we can use this information to optimize the transformation
QMatrix4x4 matrix = texture->matrix(UnnormalizedCoordinates); QMatrix4x4 matrix = texture->matrix(UnnormalizedCoordinates);
matrix.translate(-rect.x(), -rect.y()); matrix.translate(-rect.x(), -rect.y());
float uCoeff = matrix(0, 0); // Since we know that the texture matrix just scales and translates
float vCoeff = matrix(1, 1); // we can use this information to optimize the transformation
const QVector2D coeff(matrix(0, 0), matrix(1, 1));
const QVector2D offset(matrix(0, 3), matrix(1, 3));
float uOffset = matrix(0, 3); const GLVertexAttrib attribs[] = {
float vOffset = matrix(1, 3); { VA_Position, 2, GL_FLOAT, offsetof(GLVertex2D, position) },
{ VA_TexCoord, 2, GL_FLOAT, offsetof(GLVertex2D, texcoord) },
};
// Note: The positions in a WindowQuad are stored in clockwise order GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
const int index[] = { 1, 0, 3, 3, 2, 1 }; vbo->setAttribLayout(attribs, 2, sizeof(GLVertex2D));
vbo->setVertexCount(quads.count() * 6);
GLVertex2D *vertex = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D));
foreach (const WindowQuad &quad, quads) { foreach (const WindowQuad &quad, quads) {
for (int i = 0; i < 6; i++) { GLVertex2D v[4]; // Four unique vertices / quad
const WindowVertex &v = quad[index[i]];
vertices << v.x(); for (int i = 0; i < 4; i++) {
vertices << v.y(); const WindowVertex &wv = quad[i];
texcoords << v.originalX() * uCoeff + uOffset; v[i].position = QVector2D(wv.x(), wv.y());
texcoords << v.originalY() * vCoeff + vOffset; v[i].texcoord = QVector2D(wv.originalX(), wv.originalY()) * coeff + offset;
} }
// First triangle
*(vertex++) = v[1]; // Top-right
*(vertex++) = v[0]; // Top-left
*(vertex++) = v[3]; // Bottom-left
// Second triangle
*(vertex++) = v[3]; // Bottom-left
*(vertex++) = v[2]; // Bottom-right
*(vertex++) = v[1]; // Top-right
} }
GLVertexBuffer::streamingBuffer()->setData(quads.count() * 6, 2, vertices.constData(), texcoords.constData()); vbo->unmap();
} }
void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQuadList& quads, void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQuadList& quads,