summaryrefslogtreecommitdiffstats
path: root/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h')
-rw-r--r--src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
index fb4826e..2eca726 100644
--- a/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
+++ b/src/runtimerender/Qt3DSDistanceFieldGlyphCache_p.h
@@ -54,10 +54,10 @@ class Q3DSDistanceFieldGlyphCache : public QSGDistanceFieldGlyphCache
{
public:
struct TextureInfo {
- qt3ds::render::NVRenderTexture2D *texture;
+ qt3ds::render::NVRenderTexture2D *texture = nullptr;
int padding = -1;
- QRect allocatedArea;
+ QRect allocatedArea = QRect(0, 0, 1, 1);
QImage copy;
};
@@ -84,12 +84,12 @@ private:
bool loadPregeneratedCache(const QRawFont &font);
TextureInfo *textureInfo(int index) const;
- 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;
+ int m_maxTextureWidth = 0;
+ int m_maxTextureHeight = 0;
int m_maxTextureCount = 3;
mutable QVector<TextureInfo> m_textures;