Lock on texture mutex when updating atlas reference counts

tangrams · Dec 22, 2016 · 4f64a90 · 4f64a90
1 parent 75f31f2
commit 4f64a90
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/core/src/text/fontContext.cpp b/core/src/text/fontContext.cpp
@@ -217,17 +217,20 @@ bool FontContext::layoutText(TextStyle::Parameters& _params, const std::string&
                      (metrics.aabb.y + height * 0.5) * TextVertex::position_scale);
 
 
-    for (; it != _quads.end(); ++it) {
+    {
+        std::lock_guard<std::mutex> lock(m_textureMutex);
+        for (; it != _quads.end(); ++it) {
 
-        if (!_refs[it->atlas]) {
-            _refs[it->atlas] = true;
-            m_atlasRefCount[it->atlas]++;
-        }
+            if (!_refs[it->atlas]) {
+                _refs[it->atlas] = true;
+                m_atlasRefCount[it->atlas]++;
+            }
 
-        it->quad[0].pos -= offset;
-        it->quad[1].pos -= offset;
-        it->quad[2].pos -= offset;
-        it->quad[3].pos -= offset;
+            it->quad[0].pos -= offset;
+            it->quad[1].pos -= offset;
+            it->quad[2].pos -= offset;
+            it->quad[3].pos -= offset;
+        }
     }
 
     return true;

diff --git a/core/src/text/fontContext.h b/core/src/text/fontContext.h
@@ -88,8 +88,6 @@ class FontContext : public alfons::TextureCallback {
 
     void releaseAtlas(std::bitset<max_textures> _refs);
 
-    alfons::GlyphAtlas& atlas() { return m_atlas; }
-
     /* Update all textures batches, uploads the data to the GPU */
     void updateTextures(RenderState& rs);