diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-08 01:00:31 +0200 |
| commit | 38e97c68ba25c29a6fbdd3f79d56fd52a0f58a4c (patch) | |
| tree | 10bba7efed661c45e62c89c07f8b0f01d9bf6701 /src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp | |
| parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
| parent | e5f3e7149b7e130c375c1419f1f804dfeaf578aa (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib381f350ada365747ce20b989bfdc368d75f2219
Diffstat (limited to 'src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp index 28fc10e413..53b6fe117f 100644 --- a/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgrhidistancefieldglyphcache.cpp @@ -182,7 +182,9 @@ void QSGRhiDistanceFieldGlyphCache::storeGlyphs(const QList<QDistanceField> &gly for (int i = 0; i < glyphs.size(); ++i) { TextureInfo *texInfo = m_glyphsTexture.value(glyphs.at(i).glyph()); if (!texInfo->uploads.isEmpty()) { - m_resourceUpdates->uploadTexture(texInfo->texture, texInfo->uploads); + QRhiTextureUploadDescription desc; + desc.setEntries(texInfo->uploads.cbegin(), texInfo->uploads.cend()); + m_resourceUpdates->uploadTexture(texInfo->texture, desc); texInfo->uploads.clear(); } } |