diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-16 17:03:47 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-17 17:42:01 +0200 |
| commit | 83fb4f6743860bfb746e6243aad00513d498db4f (patch) | |
| tree | 816bf1a1d509124c6bfb4fc34cce2a4ed885f40e /src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | |
| parent | 48e919e9647fd07351be37e1ad7efdda9c550be9 (diff) | |
Clean up QT_CONFIG(opengl)
Accelerated graphics is now possible without OpenGL support. With
this change, a Qt build with -no-opengl can still run Qt Quick with
a Vulkan, Metal, or Direct3D backend.
Fixes: QTBUG-84027
Change-Id: Ib63c733d28cfdf7de16b138df136fa7628e1747b
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultglyphnode_p.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp index b158a68dcb..475dbea393 100644 --- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp @@ -480,7 +480,7 @@ void QSGTextMaskMaterial::populate(const QPointF &p, qreal glyphCacheInverseScaleY = 1.0 / glyphCacheScaleY; qreal scaledMargin = margin * glyphCacheInverseScaleX; - Q_ASSERT(geometry->indexType() == GL_UNSIGNED_SHORT); + Q_ASSERT(geometry->indexType() == QSGGeometry::UnsignedShortType); geometry->allocate(glyphIndexes.size() * 4, glyphIndexes.size() * 6); QVector4D *vp = (QVector4D *)geometry->vertexDataAsTexturedPoint2D(); Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D)); |