diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-08-13 10:13:47 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-08-14 14:26:31 +0200 |
| commit | f1e6bb635faa0e21fd34dfee4786b2969cf1a6a5 (patch) | |
| tree | 67584d93f6dd60c598dbf56b6226c31d3b0be856 /src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp | |
| parent | 74f6b1262445e56d2511fe24caa9704cf563512b (diff) | |
Adapt distance field cache to 5.14
There is a new pure virtual in the base class in 5.14. It is not very
relevant here since this glyph cache is not used in combination with
the df text materials of Qt Quick. We can nonetheless implement the
virtual and return the correct value.
Task-number: QT3DS-3856
Change-Id: I97b807ec73a664488b63c8888bc8cd90a9c53589
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp')
| -rw-r--r-- | src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp index e945335..b919ca5 100644 --- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp +++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache.cpp @@ -513,6 +513,14 @@ bool Q3DSDistanceFieldGlyphCache::loadPregeneratedCache(const QRawFont &font) return true; } +#if QT_VERSION >= QT_VERSION_CHECK(5,14,0) +bool Q3DSDistanceFieldGlyphCache::eightBitFormatIsAlphaSwizzled() const +{ + return m_context.GetRenderContext().GetRenderContextType() + == qt3ds::render::NVRenderContextValues::GLES2; +} +#endif // QT_VERSION >= QT_VERSION_CHECK(5,14,0) + QT_END_NAMESPACE #endif // QT_VERSION >= QT_VERSION_CHECK(5,12,2) |