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

kwin: Use the new API for rendering quads

Browse source
This commit is contained in:
Fredrik Höglund 2013-03-21 23:52:03 +01:00
parent dbbda21129
commit 57b78daf33
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
scene_opengl.cpp
View file

@ -1271,14 +1271,25 @@ 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);
// Render geometry // Render geometry
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLenum primitiveType;
vbo->setVertexCount(quads.count() * 6); int primcount;
GLVertex2D *map = (GLVertex2D *) vbo->map(quads.count() * 6 * sizeof(GLVertex2D)); if (GLVertexBuffer::supportsIndexedQuads()) {
quads.makeInterleavedArrays(GL_TRIANGLES, map, matrix); primitiveType = GL_QUADS_KWIN;
primcount = quads.count() * 4;
} else {
primitiveType = GL_TRIANGLES;
primcount = quads.count() * 6;
}
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
vbo->setVertexCount(primcount);
GLVertex2D *map = (GLVertex2D *) vbo->map(primcount * sizeof(GLVertex2D));
quads.makeInterleavedArrays(primitiveType, map, matrix);
vbo->unmap(); vbo->unmap();
vbo->render(region, GL_TRIANGLES, m_hardwareClipping); vbo->render(region, primitiveType, m_hardwareClipping);
} }
GLTexture *SceneOpenGL::Window::textureForType(SceneOpenGL::Window::TextureType type) GLTexture *SceneOpenGL::Window::textureForType(SceneOpenGL::Window::TextureType type)
@ -1433,7 +1444,12 @@ void SceneOpenGL2Window::performPaint(int mask, QRegion region, WindowPaintData
} }
} }
size_t size = 6 * (quads[0].count() + quads[1].count() + quads[2].count() + quads[3].count()) * sizeof(GLVertex2D); const bool indexedQuads = GLVertexBuffer::supportsIndexedQuads();
const GLenum primitiveType = indexedQuads ? GL_QUADS_KWIN : GL_TRIANGLES;
const int verticesPerQuad = indexedQuads ? 4 : 6;
const size_t size = verticesPerQuad *
(quads[0].count() + quads[1].count() + quads[2].count() + quads[3].count()) * sizeof(GLVertex2D);
GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer(); GLVertexBuffer *vbo = GLVertexBuffer::streamingBuffer();
GLVertex2D *map = (GLVertex2D *) vbo->map(size); GLVertex2D *map = (GLVertex2D *) vbo->map(size);
@ -1446,12 +1462,12 @@ void SceneOpenGL2Window::performPaint(int mask, QRegion region, WindowPaintData
continue; continue;
nodes[i].firstVertex = v; nodes[i].firstVertex = v;
nodes[i].vertexCount = quads[i].count() * 6; nodes[i].vertexCount = quads[i].count() * verticesPerQuad;
const QMatrix4x4 matrix = nodes[i].texture->matrix(nodes[i].coordinateType); const QMatrix4x4 matrix = nodes[i].texture->matrix(nodes[i].coordinateType);
quads[i].makeInterleavedArrays(GL_TRIANGLES, &map[v], matrix); quads[i].makeInterleavedArrays(primitiveType, &map[v], matrix);
v += quads[i].count() * 6; v += quads[i].count() * verticesPerQuad;
} }
vbo->unmap(); vbo->unmap();
@ -1478,7 +1494,7 @@ void SceneOpenGL2Window::performPaint(int mask, QRegion region, WindowPaintData
nodes[i].texture->setWrapMode(GL_CLAMP_TO_EDGE); nodes[i].texture->setWrapMode(GL_CLAMP_TO_EDGE);
nodes[i].texture->bind(); nodes[i].texture->bind();
vbo->draw(region, GL_TRIANGLES, nodes[i].firstVertex, nodes[i].vertexCount, m_hardwareClipping); vbo->draw(region, primitiveType, nodes[i].firstVertex, nodes[i].vertexCount, m_hardwareClipping);
} }
vbo->unbindArrays(); vbo->unbindArrays();