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

kwin: Declare the attribute layout once in SceneOpenGL::Window

Browse source 
The same layout is used for all draw calls in
SceneOpenGL::Window::performPaint().
This commit is contained in:
Fredrik Höglund 2012-10-12 13:20:23 +02:00
parent d6fadfa91c
commit 1f6b791f11
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene_opengl.cpp
View file

@ -1102,8 +1102,14 @@ void SceneOpenGL::Window::performPaint(int mask, QRegion region, WindowPaintData
beginRenderWindow(mask, data); beginRenderWindow(mask, data);
const GLVertexAttrib attribs[] = {
{ VA_Position, 2, GL_FLOAT, offsetof(GLVertex2D, position) },
{ VA_TexCoord, 2, GL_FLOAT, offsetof(GLVertex2D, texcoord) },
};
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->reset(); vbo->reset();
vbo->setAttribLayout(attribs, 2, sizeof(GLVertex2D));
// shadow // shadow
if (m_shadow) { if (m_shadow) {
@ -1272,13 +1278,7 @@ void SceneOpenGL::Window::makeDecorationArrays(const WindowQuadList &quads, cons
const QVector2D coeff(matrix(0, 0), matrix(1, 1)); const QVector2D coeff(matrix(0, 0), matrix(1, 1));
const QVector2D offset(matrix(0, 3), matrix(1, 3)); const QVector2D offset(matrix(0, 3), matrix(1, 3));
const GLVertexAttrib attribs[] = {
{ VA_Position, 2, GL_FLOAT, offsetof(GLVertex2D, position) },
{ VA_TexCoord, 2, GL_FLOAT, offsetof(GLVertex2D, texcoord) },
};
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->setAttribLayout(attribs, 2, sizeof(GLVertex2D));
vbo->setVertexCount(quads.count() * 6); vbo->setVertexCount(quads.count() * 6);
GLVertex2D *vertex = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D)); GLVertex2D *vertex = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D));
@ -1315,14 +1315,8 @@ void SceneOpenGL::Window::renderQuads(int, const QRegion& region, const WindowQu
const QMatrix4x4 matrix = tex->matrix(normalized ? NormalizedCoordinates : UnnormalizedCoordinates); const QMatrix4x4 matrix = tex->matrix(normalized ? NormalizedCoordinates : UnnormalizedCoordinates);
const GLVertexAttrib attribs[] = {
{ VA_Position, 2, GL_FLOAT, offsetof(GLVertex2D, position) },
{ VA_TexCoord, 2, GL_FLOAT, offsetof(GLVertex2D, texcoord) },
};
// Render geometry // Render geometry
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->setAttribLayout(attribs, 2, sizeof(GLVertex2D));
vbo->setVertexCount(quads.count() * 6); vbo->setVertexCount(quads.count() * 6);
GLVertex2D *map = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D)); GLVertex2D *map = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D));