diff options
author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-20 13:12:37 +0300 |
---|---|---|
committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-20 14:12:47 +0300 |
commit | d7bbf9d82e9f129877e6d304b527071155348c59 (patch) | |
tree | 361b362deb1752274112f63890d04c9ae8a0b6d0 /src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h | |
parent | 52092eb06cb659f661d757ae6c2351e58ebbdc1b (diff) |
Copy distance field shader changes to OpenGL runtime
Also fixes the OpenGL runtime to use alpha channel for the glyph texture
when using ES2.
Task-number: QT3DS-3343
Change-Id: Ia37c341802e504da21ebeaff6f3f1f5b50bd1bfe
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h')
-rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h b/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h index e3ec204a..679d3ad7 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h +++ b/src/Runtime/Source/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h @@ -82,6 +82,7 @@ private: int maxTextureSize() const; void resizeTexture(TextureInfo *info, int width, int height); + void setTextureData(qt3ds::render::NVRenderTexture2D *texture, QImage &image); QSGAreaAllocator *m_areaAllocator = nullptr; int m_maxTextureSize = 0; |