AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a VAO in the texture glyph cache

Browse Source 
Task-number: QTBUG-36993
Change-Id: Icc77035b582c804ed809ea3cd99c0048b34d41d2
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Laszlo Agocs 2014-02-25 11:03:31 +01:00 committed by The Qt Project
parent f7f70c4a7a
commit f645dad757
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/opengl/qopengltextureglyphcache.cpp
View File

@ -164,6 +164,19 @@ void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
m_buffer.allocate(buf, sizeof(buf));
m_buffer.release();
}
if (!m_vao.isCreated())
m_vao.create();
}
void QOpenGLTextureGlyphCache::setupVertexAttribs()
{
m_buffer.bind();
m_blitProgram->setAttributeBuffer(int(QT_VERTEX_COORDS_ATTR), GL_FLOAT, 0, 2);
m_blitProgram->setAttributeBuffer(int(QT_TEXTURE_COORDS_ATTR), GL_FLOAT, sizeof(m_vertexCoordinateArray), 2);
m_blitProgram->enableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
m_blitProgram->enableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
m_buffer.release();
}
void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
@ -262,16 +275,19 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
m_blitProgram->bindAttributeLocation("textureCoordArray", QT_TEXTURE_COORDS_ATTR);
m_blitProgram->link();
if (m_vao.isCreated()) {
m_vao.bind();
setupVertexAttribs();
}
}
m_buffer.bind();
m_blitProgram->bind();
m_blitProgram->setAttributeBuffer(int(QT_VERTEX_COORDS_ATTR), GL_FLOAT, 0, 2);
m_blitProgram->setAttributeBuffer(int(QT_TEXTURE_COORDS_ATTR), GL_FLOAT, sizeof(m_vertexCoordinateArray), 2);
m_blitProgram->enableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
m_blitProgram->enableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
m_blitProgram->disableAttributeArray(int(QT_OPACITY_ATTR));
if (m_vao.isCreated())
m_vao.bind();
else
setupVertexAttribs();
m_blitProgram->bind();
blitProgram = m_blitProgram;
} else {
@ -301,9 +317,12 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
glViewport(0, 0, pex->width, pex->height);
pex->updateClipScissorTest();
} else {
m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
m_blitProgram->disableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
m_buffer.release();
if (m_vao.isCreated()) {
m_vao.release();
} else {
m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
m_blitProgram->disableAttributeArray(int(QT_TEXTURE_COORDS_ATTR));
}
}
}

4
src/gui/opengl/qopengltextureglyphcache_p.h
View File

@ -58,6 +58,7 @@
#include <qopenglshaderprogram.h>
#include <qopenglfunctions.h>
#include <qopenglbuffer.h>
#include <qopenglvertexarrayobject.h>
// #define QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
@ -153,6 +154,8 @@ public:
void clear();
private:
void setupVertexAttribs();
QOpenGLGlyphTexture *m_textureResource;
QOpenGL2PaintEngineExPrivate *pex;
@ -165,6 +168,7 @@ private:
int m_serialNumber;
QOpenGLBuffer m_buffer;
QOpenGLVertexArrayObject m_vao;
};
QT_END_NAMESPACE