From 51ff897ee513f4327ac7415bcf37be8560772061 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 11 Feb 2015 12:59:12 -0800
Subject: [PATCH] Update Font to not setup GL until first draw

---
 libraries/render-utils/src/TextRenderer.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/libraries/render-utils/src/TextRenderer.cpp b/libraries/render-utils/src/TextRenderer.cpp
index 5a1d09a148..0c6d1523d4 100644
--- a/libraries/render-utils/src/TextRenderer.cpp
+++ b/libraries/render-utils/src/TextRenderer.cpp
@@ -136,10 +136,12 @@ public:
 
     glm::vec2 drawString(float x, float y, const QString & str,
             const glm::vec4& color, TextRenderer::EffectType effectType,
-            const glm::vec2& bound) const;
+            const glm::vec2& bound);
 
 private:
     QStringList tokenizeForWrapping(const QString & str) const;
+
+    bool _initialized;
 };
 
 static QHash<QString, Font*> LOADED_FONTS;
@@ -186,7 +188,7 @@ Font* loadFont(const QString& family) {
     return LOADED_FONTS[family];
 }
 
-Font::Font() {
+Font::Font() : _initialized(false) {
     static bool fontResourceInitComplete = false;
     if (!fontResourceInitComplete) {
         Q_INIT_RESOURCE(fonts);
@@ -255,8 +257,6 @@ void Font::read(QIODevice& in) {
         // store in the character to glyph hash
         _glyphs[g.c] = g;
     };
-
-    setupGL();
 }
 
 struct TextureVertex {
@@ -291,6 +291,11 @@ QRectF Glyph::textureBounds(const glm::vec2 & textureSize) const {
 }
 
 void Font::setupGL() {
+    if (_initialized) {
+        return;
+    }
+    _initialized = true;
+
     _texture = TexturePtr(
             new QOpenGLTexture(_image, QOpenGLTexture::GenerateMipMaps));
     _program = ProgramPtr(new QOpenGLShaderProgram());
@@ -411,7 +416,11 @@ glm::vec2 Font::computeExtent(const QString & str) const {
 // even without explicit line feeds.
 glm::vec2 Font::drawString(float x, float y, const QString & str,
         const glm::vec4& color, TextRenderer::EffectType effectType,
-        const glm::vec2& bounds) const {
+        const glm::vec2& bounds) {
+
+    if (!_initialized) {
+        setupGL();
+    }
 
     // Stores how far we've moved from the start of the string, in DTP units
     glm::vec2 advance(0, -_rowHeight - _descent);