display/text: Write glyphs straight to displaylist. Hack, but faster

2 files changed, 13 insertions, 11 deletions

diff --git a/virtual-programs/display.folk b/virtual-programs/display.folk
index 0cfc63b2..07b94825 100644
--- a/virtual-programs/display.folk
+++ b/virtual-programs/display.folk
@@ -110,13 +110,15 @@ Start process "display" {
     }
 
     while true {
+        set ::displayList [list]
         Step
+        foreach match [Statements::findMatches {/someone/ wishes the GPU draws pipeline /name/ with arguments /args/}] {
+            lappend ::displayList [list Gpu::draw [dict get $::pipelines [dict get $match name]] {*}[dict get $match args]]
+        }
 
         set renderTime [baretime {
             Gpu::drawStart
-            foreach match [Statements::findMatches {/someone/ wishes the GPU draws pipeline /name/ with arguments /args/}] {
-                Gpu::draw [dict get $::pipelines [dict get $match name]] {*}[dict get $match args]
-            }
+            foreach displayCommand $::displayList { {*}$displayCommand }
             Gpu::drawEnd
         }]
 
diff --git a/virtual-programs/display/text.folk b/virtual-programs/display/text.folk
index 3f2b4b5c..412ce266 100644
--- a/virtual-programs/display/text.folk
+++ b/virtual-programs/display/text.folk
@@ -38,12 +38,12 @@ On process "display" {
     set median [Gpu::fn {float r float g float b} float {
         return max(min(r, g), min(max(r, g), b));
     }]
-    dict set ::pipelines "glyph" [Gpu::pipeline \
-                                      {sampler2D atlas vec2 atlasSize
-                                       vec4 atlasGlyphBounds
-                                       vec4 planeGlyphBounds
-                                       vec2 pos float radians float em
-                                       fn rotate} {
+    set glyph [Gpu::pipeline \
+                   {sampler2D atlas vec2 atlasSize
+                       vec4 atlasGlyphBounds
+                       vec4 planeGlyphBounds
+                       vec2 pos float radians float em
+                       fn rotate} {
          float left = planeGlyphBounds[0] * em;
          float bottom = planeGlyphBounds[1] * em;
          float right = planeGlyphBounds[2] * em;
@@ -139,8 +139,8 @@ On process "display" {
             }
             lassign $glyphInfo advance planeBounds atlasBounds
             if {$char ne " "} {
-                Wish the GPU draws pipeline "glyph" with arguments \
-                    [list $fontAtlas $fontAtlasSize \
+                lappend ::displayList \
+                    [list Gpu::draw $glyph $fontAtlas $fontAtlasSize \
                          $atlasBounds $planeBounds [list $x $y] $radians $em]
             }
             lassign [vec2 add [list $x $y] \