From 10251c64844788fde027de4ab44cce2450898d08 Mon Sep 17 00:00:00 2001
From: EvilSpirit <anandamide@mail.ru>
Date: Mon, 19 Dec 2016 22:27:08 +0700
Subject: [PATCH] In OpenGl2Renderer, do not issue a draw call per
 DrawVectorText call.

This significantly improves performance with ANGLE.
---
 src/render/rendergl2.cpp | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/render/rendergl2.cpp b/src/render/rendergl2.cpp
index 7a1483c0..00ab2b5e 100644
--- a/src/render/rendergl2.cpp
+++ b/src/render/rendergl2.cpp
@@ -100,7 +100,6 @@ public:
 
     void DrawLine(const Vector &a, const Vector &b, hStroke hcs) override;
     void DrawEdges(const SEdgeList &el, hStroke hcs) override;
-    void DrawEdgesInternal(const SEdgeList &el, hStroke hcs);
     bool DrawBeziers(const SBezierList &bl, hStroke hcs) override { return false; }
     void DrawOutlines(const SOutlineList &ol, hStroke hcs, DrawOutlinesAs mode) override;
     void DrawVectorText(const std::string &text, double height,
@@ -436,23 +435,6 @@ void OpenGl2Renderer::DrawEdges(const SEdgeList &el, hStroke hcs) {
     }
 }
 
-void OpenGl2Renderer::DrawEdgesInternal(const SEdgeList &el, hStroke hcs) {
-    if(el.l.n == 0) return;
-
-    Stroke *stroke = SelectStroke(hcs);
-    if(stroke->stipplePattern == StipplePattern::ZIGZAG ||
-       stroke->stipplePattern == StipplePattern::FREEHAND)
-    {
-        for(const SEdge *e = el.l.First(); e; e = el.l.NextAfter(e)) {
-            DoStippledLine(e->a, e->b, hcs);
-        }
-        return;
-    }
-
-    edgeRenderer.SetStroke(*stroke, 1.0 / camera.scale);
-    edgeRenderer.Draw(el);
-}
-
 void OpenGl2Renderer::DrawOutlines(const SOutlineList &ol, hStroke hcs, DrawOutlinesAs mode) {
     if(ol.l.n == 0) return;
 
@@ -468,11 +450,16 @@ void OpenGl2Renderer::DrawOutlines(const SOutlineList &ol, hStroke hcs, DrawOutl
 void OpenGl2Renderer::DrawVectorText(const std::string &text, double height,
                                      const Vector &o, const Vector &u, const Vector &v,
                                      hStroke hcs) {
-    SEdgeList el = {};
-    auto traceEdge = [&](Vector a, Vector b) { el.AddEdge(a, b); };
+    SEdgeListItem *eli = lines.FindByIdNoOops(hcs);
+    if(eli == NULL) {
+        SEdgeListItem item = {};
+        item.h = hcs;
+        lines.Add(&item);
+        eli = lines.FindByIdNoOops(hcs);
+    }
+    SEdgeList &lines = eli->lines;
+    auto traceEdge = [&](Vector a, Vector b) { lines.AddEdge(a, b); };
     VectorFont::Builtin()->Trace(height, o, u, v, text, traceEdge, camera);
-    DrawEdgesInternal(el, hcs);
-    el.Clear();
 }
 
 void OpenGl2Renderer::DrawQuad(const Vector &a, const Vector &b, const Vector &c, const Vector &d,
@@ -643,7 +630,10 @@ void OpenGl2Renderer::FlushFrame() {
     meshes.Clear();
 
     for(SEdgeListItem &eli : lines) {
-        DrawEdgesInternal(eli.lines, eli.h);
+        Stroke *stroke = SelectStroke(eli.h);
+
+        edgeRenderer.SetStroke(*stroke, 1.0 / camera.scale);
+        edgeRenderer.Draw(eli.lines);
         eli.lines.Clear();
     }
     lines.Clear();